Merge branch 'develop4' of http://172.16.29.40:8010/wms/wms4.git into develop4

谭毅彬
2 parents b6ad31fd e559bcc8
Showing 4 changed files with 41 additions and 12 deletions
ant-design-vue-jeecg/src/views/system/stocktaking/modules/AdjustmentDocModal.vue
ant-design-vue-jeecg/src/views/system/stocktaking/subTables/CycleCountDetailChildSubTable.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -32,7 +32,6 @@ export default {
   name: "AdjustmentDocModal",
   components: {},
   props: {
-    id: "",
     taskHeaderId:"",
   },
   data() {
@@ -41,7 +40,7 @@ export default {
       width: 500,
       visible: false,
       model: {
-        id:this.id,
+        id:'',
         countedQty:'',
         state:this.taskHeaderId,
       },
@@ -78,7 +77,9 @@ export default {
     add() {
       this.edit(this.modelDefault);
     },
-    edit() {
+    edit(id) {
+      this.model.id=id;
+      alert(this.model.id)
       this.visible = true;
     },
     close() {
@@ -22,8 +22,8 @@
     </template>
     <template slot="action" slot-scope="text, record">
-      <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id"/>
-      <a v-if="record.childStatus != 1" @click="createMany(record)"><a-icon />实盘登记</a>
+      <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk"/>
+      <a v-if="record.childStatus != 1" @click="createMany(record.id)"><a-icon />实盘登记</a>
     </template>
     <template slot="fileSlot" slot-scope="text">
@@ -171,8 +171,8 @@
           this.loading = false
         })
       },
-      createMany() {
-        this.$refs.adjustmentModal.edit();
+      createMany(id) {
+        this.$refs.adjustmentModal.edit(id);
         this.$refs.adjustmentModal.title = "实盘登记";
       },
@@ -335,8 +335,18 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
 			return Result.error("盘点明细不存在");
 		}
+
+		if (cycleCountDetail.getEnableStatus().equals(QuantityConstant.CYCLECOUNT_STATUS_BUILD))
+		{
+			return Result.error("当前盘点明细是新建状态 不能调整");
+		}
+
+		if (cycleCountDetailChild.getCountedQty().compareTo(BigDecimal.ZERO)==0)
+		{
+			return Result.error("别闹");
+		}
+
 		cycleCountDetailChild.setCyclecountheadcode(cycleCountDetail.getCycleCountHeadCode());
-		cycleCountDetailChild.setChildStatus(QuantityConstant.CYCLECOUNT_STATUS_REGISTERED);
 		cycleCountDetailChild.setLocationCode(cycleCountDetail.getLocationCode());
 		cycleCountDetailChild.setContainerCode(cycleCountDetail.getContainerCode());
@@ -344,11 +354,29 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
 		cycleCountDetailChild.setMaterialName(materialByCode.getName());
 		cycleCountDetailChild.setMaterialSpec(materialByCode.getSpec());
 		cycleCountDetailChild.setMaterialUnit(materialByCode.getUnit());
+		BigDecimal countedQty = cycleCountDetailChild.getCountedQty();
+		cycleCountDetailChild.setCountedQty(null);
+
+
+		LambdaQueryWrapper<CycleCountDetailChild> childLambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountDetailChild);
+		CycleCountDetailChild serviceImplOne = cycleCountDetailChildServiceImpl.getOne(childLambdaQueryWrapper);
+		if (serviceImplOne!=null)
+		{
+			return Result.error("这个物料明细已存在");
+		}
+
+		cycleCountDetailChild.setChildStatus(QuantityConstant.CYCLECOUNT_STATUS_REGISTERED);
 		cycleCountDetailChild.setSystemQty(BigDecimal.ZERO);
-		cycleCountDetailChild.setGapQty(BigDecimal.ZERO.subtract(cycleCountDetailChild.getCountedQty()));
+		cycleCountDetailChild.setGapQty(BigDecimal.ZERO.subtract(countedQty));
+		cycleCountDetailChild.setCountedQty(countedQty);
 		cycleCountDetailChildServiceImpl.save(cycleCountDetailChild);
-		return Result.ok("成功");
+		Result result = new Result();
+		result.setCode(200);
+		result.setMessage("成功");
+		result.setResult(cycleCountDetail.getCycleCountHeadId());
+
+		return result;
 	}
@@ -1540,9 +1540,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         //1.先拿到盘点单主单据
         CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(taskHeader.getShipmentContainerHeaderId());
-        if (cycleCountDetail.getSystemQty().compareTo(BigDecimal.ZERO)==0)
+        if ((cycleCountDetail.getCountedQty().add(cycleCountDetail.getGapQty())).compareTo(BigDecimal.ZERO)==0)
         {
-            return Result.error("盘点单据系统数量为0,不能完成 单据号+" +cycleCountDetail.getCycleCountHeadCode());
+            return Result.error("盘点单据系统实盘数量跟差异数量0,不能完成 单据号" +cycleCountDetail.getCycleCountHeadCode());
         }
         //2.盘点单主单据查明细单据list