diff --git a/.idea/artifacts/depository_manage_war_exploded.xml b/.idea/artifacts/depository_manage_war_exploded.xml deleted file mode 100644 index c0550256..00000000 --- a/.idea/artifacts/depository_manage_war_exploded.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - $PROJECT_DIR$/target/depository - - - true - depository_manage - war - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/depository_war.xml b/.idea/artifacts/depository_war.xml deleted file mode 100644 index ebd11983..00000000 --- a/.idea/artifacts/depository_war.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - $PROJECT_DIR$/target - - - depository - war - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 3bcace72..9ee5a8db 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -9,6 +9,7 @@ + diff --git a/.idea/depositroy.iml b/.idea/depositroy.iml new file mode 100644 index 00000000..78b2cc53 --- /dev/null +++ b/.idea/depositroy.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 39b3c67d..6c027f3d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -145,6 +145,7 @@ public class DepositoryRecordController { UserByPort departmentHeadByUser = findDepartmentHeadByUser(userToken); map.put("departmenthead",departmentHeadByUser.getId()); map.put("applicantId",userToken.getId()); + return CrudUtil.postHandle(depositoryRecordService.transferApply(map),1); } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java index 14299bbe..a6c9250a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java @@ -100,4 +100,9 @@ public class ApplicationOutRecord { */ private Integer istransfer; + /** + * 转移申请编号 + */ + private Integer transferId; + } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/TransferRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/TransferRecord.java index 1775eac4..dcf43025 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/TransferRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/TransferRecord.java @@ -21,6 +21,21 @@ public class TransferRecord implements java.io.Serializable { /** 转入仓库id */ private Integer toId; + /** + * 转移物品编号 + */ + private Integer mid; + + /** + * 申请时间 + */ + private Long applicantTime; + + /** + * 申请人 + */ + private Integer applicantId; + /* This code was generated by TableGo tools, mark 1 end. */ /* This code was generated by TableGo tools, mark 2 begin. */ @@ -82,5 +97,29 @@ public class TransferRecord implements java.io.Serializable { this.toId = toId; } + public Integer getMid() { + return mid; + } + + public void setMid(Integer mid) { + this.mid = mid; + } + + public Long getApplicantTime() { + return applicantTime; + } + + public void setApplicantTime(Long applicantTime) { + this.applicantTime = applicantTime; + } + + public Integer getApplicantId() { + return applicantId; + } + + public void setApplicantId(Integer applicantId) { + this.applicantId = applicantId; + } + /* This code was generated by TableGo tools, mark 2 end. */ } \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index a8e65d91..de1b854d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -80,6 +80,7 @@ + @@ -114,7 +115,7 @@ aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, - depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer + depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,transferId SELECT @@ -34,7 +37,16 @@ AND tr.to_id = #{toId} - --> + + and tr.mid = #{mid} + + + and tr.applicantTime = #{applicantTime} + + + and tr.applicantId = #{applicantId} + + - + INSERT INTO transfer_record ( - id, from_id, to_id,quantity + id, from_id, to_id,quantity,mid,applicantTime,applicantId ) VALUES ( #{id}, #{fromId}, #{toId}, - #{quantity} + #{quantity}, + #{mid}, + #{applicantTime}, + #{applicantId} ) diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java index fb06355d..6d87a788 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java @@ -123,4 +123,9 @@ public class ApplicationOutRecordP { * 是否为转移申请 */ private Integer istransfer; + + /** + * 转移申请编号 + */ + private Integer transferId; } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index eee1ed8f..7c6d540d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -130,13 +130,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("applicantTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("price", material.getPrice() * quantity * 100); map.put("istransfer",1); - depositoryRecordMapper.insertApplicationOutRecord(map); map.put("fromId", material.getDepositoryId()); //清除主键 // depositoryRecordMapper.insertApplicationInRecord(map); - map.put("toId", map.get("id")); + transferRecordMapper.addTransferRecord(map); + TransferRecord transferRecordByCondition = transferRecordMapper.findTransferRecordByCondition(map).get(0); + map.put("transferId",transferRecordByCondition.getId()); //清除主键 - return transferRecordMapper.addTransferRecord(map); + return depositoryRecordMapper.insertApplicationOutRecord(map); } /** @@ -183,7 +184,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { material.setQuantity(material.getQuantity() - record.getQuantity()); materialMapper.updateMaterial(material); if(record.getIstransfer() == 1){ - applicationIn(map); + map.put("quantity",record.getQuantity().toString()); + map.put("applicantId",record.getApplicantId()); + map.put("transferId",record.getTransferId()); + transferMaterial(map); } } else { throw new MyException("库存不足于该出库请求"); @@ -193,9 +197,43 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("state", "仓库管理员审核未通过"); } } -// return depositoryRecordMapper.updateDepositoryRecord(map); return depositoryRecordMapper.updateApplicationOutRecord(map); } + + /** + * 转移物品 + * @param map + */ + public void transferMaterial(Map map){ + Map param = new HashMap<>(); + Integer transferId = ObjectFormatUtil.toInteger(map.get("transferId")); + TransferRecord transferRecor = transferRecordMapper.findTransferRecordById(transferId); + Integer mid = transferRecor.getMid(); + Material material = materialMapper.findMaterialById(mid); + param.put("mname",material.getMname()); + param.put("depositoryId",transferRecor.getToId()); + List materiallist = materialMapper.findMaterialByCondition(param); + map.put("mid",materiallist.get(0).getId()); + if(materiallist.size() > 0){ + applicationIn(map); + }else{ + Map insert = new HashMap<>(); + Material materialById = materialMapper.findMaterialById(mid); + Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity")); + insert.put("depositoryId",transferRecor.getToId()); + insert.put("price",materialById.getPrice()); + insert.put("mname",materialById.getMname()); + insert.put("quantity",quantity); + insert.put("materialTypeId",materialById.getTypeId()); + insert.put("code",materialById.getCode()); + insert.put("unit",materialById.getUnit()); + insert.put("version",materialById.getVersion()); + insert.put("texture",materialById.getTexture()); + insert.put("amounts",quantity * materialById.getPrice()); + insert.put("depositoryCode",materialById.getDepositoryCode()); + materialMapper.insertMaterial(insert); + } + } /* @Override @Transactional public Integer review(Map map, Integer userid) { diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index a8e65d91..de1b854d 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -80,6 +80,7 @@ + @@ -114,7 +115,7 @@ aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, - depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer + depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,transferId SELECT @@ -34,7 +37,16 @@ AND tr.to_id = #{toId} - --> + + and tr.mid = #{mid} + + + and tr.applicantTime = #{applicantTime} + + + and tr.applicantId = #{applicantId} + + - + INSERT INTO transfer_record ( - id, from_id, to_id,quantity + id, from_id, to_id,quantity,mid,applicantTime,applicantId ) VALUES ( #{id}, #{fromId}, #{toId}, - #{quantity} + #{quantity}, + #{mid}, + #{applicantTime}, + #{applicantId} )