完善实盘登记

肖超群
1 parent 7018cfc9
Showing 11 changed files with 60 additions and 24 deletions
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountDetailList.vue
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountHeaderList.vue
ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountConfirmModal.vue
ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountDetailChiIdModal.vue
ant-design-vue-jeecg/src/views/system/stocktaking/subTables/CycleCountDetailChildSubTable.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/entity/CycleCountDetailChild.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailChildServiceImpl.java
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/stocktaking/cycleCountHeader/service/ICycleCountHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountHeader/service/impl/CycleCountHeaderServiceImpl.java
@@ -89,7 +89,7 @@
  
     <!-- 表单区域 -->
  
-    <cycle-count-select-modal ref="modalForm2"></cycle-count-select-modal>
+    <cycle-count-select-modal ref="modalForm2" @ok="modalFormOk"/>
     <cycle-count-detail-modal ref="modalForm" @ok="modalFormOk"/>
     <cycle-count-confirm-modal ref="modalForm3" @ok="modalFormOk"/>
  
@@ -262,6 +262,7 @@
     mounted() {
       let _this = this;
       Utils.$on('methodB',(data)=> {
+
         this.methodB(data);
         this.$emit('ok');
       })
@@ -317,6 +318,7 @@
       },
  
       methodB(data) {
+        console.log("methodB" + data);
           var _this = this;
           _this.loadDatas(data);
       },
@@ -302,6 +302,7 @@ export default {
     },
     detailModalFormOk(){
         this.loadData();
+      // this.searchQuery();
     },
     getStatusColor(status) {
       const colors = {
@@ -41,6 +41,7 @@ import { filterMultiDictText } from &#39;@/components/dict/JDictSelectUtil&#39;
 import { validateDuplicateValue } from '@/utils/util'
 import {listCycleDetailChildByDetailId, queryCycleCountDetailChildByMainId, searchMaterialByCode} from '@/api/api'
 import { listReceiveByReceiveId,ajaxGetDictItems } from '@/api/api'
+import Utils from "@comp/jeecgbiz/JButtonBizComponent/util";
  
 export default {
   name: 'CycleCountConfirmModal',
@@ -208,14 +209,15 @@ export default {
           httpAction(httpurl, this.dataSource, method)
             .then(res => {
               if (res.success) {
-                that.$message.success(res.message)
+                that.$message.success("实盘登记成功")
                 that.$emit('ok')
-                that.close()
+                Utils.$emit('methodB',res.result);
               } else {
                 that.$message.warning(res.message)
               }
             })
             .finally(() => {
+              that.close()
               that.confirmLoading = false
             })
         } else {
@@ -79,9 +79,15 @@ export default {
  
       confirmLoading: false,
       validatorRules: {
+        materialCode: [
+          {required: true, message: '请输入物料信息!'},
+        ],
         countedQty: [
           {required: true, message: '请输入实盘数量!'},
         ],
+        inventoryStatus: [
+          {required: true, message: '请选择库存状态!'},
+        ],
       },
       url: {
         add: "/cycleCountDetail/cycleCountDetail/increaseInInventoryGain",
@@ -23,7 +23,7 @@
  
     <template slot="action" slot-scope="text, record">
       <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk"/>
-      <a v-if="record.childStatus != 1 && record.childStatus != 100" @click="createMany(record)"><a-icon />实盘登记</a>
+<!--      <a v-if="record.childStatus != 1 && record.childStatus != 100" @click="createMany(record)"><a-icon />实盘登记</a>-->
     </template>
  
     <template slot="fileSlot" slot-scope="text">
@@ -33,6 +33,8 @@ import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetai
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.service.ICycleCountDetailChildService;
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.service.ICycleCountDetailService;
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.vo.CycleCountDetailPage;
+import org.jeecg.modules.wms.stocktaking.cycleCountHeader.entity.CycleCountHeader;
+import org.jeecg.modules.wms.stocktaking.cycleCountHeader.service.ICycleCountHeaderService;
 import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
@@ -85,6 +87,8 @@ public class CycleCountDetailController extends HuahengBaseController {
     private ZoneServiceImpl zoneService;
     @Resource
     private PortServiceImpl portService;
+    @Resource
+    private ICycleCountHeaderService cycleCountHeaderService;
  
     /**
      * 分页列表查询
@@ -279,22 +283,29 @@ public class CycleCountDetailController extends HuahengBaseController {
      */
     @PostMapping("/batchConfirmGapQty")
     @ResponseBody
-    public Result batchConfirmGapQty(@RequestBody List<CycleCountDetail> cycleCountDetailList) {
-        if (CollectionUtils.isEmpty(cycleCountDetailList)) {
+    public Result batchConfirmGapQty(@RequestBody List<CycleCountDetailChild> cycleCountDetailChildList) {
+        if (CollectionUtils.isEmpty(cycleCountDetailChildList)) {
             return Result.error("批量实盘登记失败参数为空");
         }
-        for (CycleCountDetail cycleCountDetail : cycleCountDetailList) {
-            int id = cycleCountDetail.getId();
-            BigDecimal countedQty = cycleCountDetail.getCountedQty();
+        int headerId = 0;
+        for (CycleCountDetailChild cycleCountDetailChild : cycleCountDetailChildList) {
+            int id = cycleCountDetailChild.getId();
+            String cycleCountCode = cycleCountDetailChild.getCyclecountheadcode();
+            CycleCountHeader cycleCountHeader = cycleCountHeaderService.getCycleCountHeaderByCode(cycleCountCode);
+            headerId = cycleCountHeader.getId();
+            BigDecimal countedQty = cycleCountDetailChild.getCountedQty();
             if (countedQty == null) {
                 throw new JeecgBootException("批量实盘登记失败参数为空");
             }
+            if (cycleCountDetailChild.getChildStatus().equals(QuantityConstant.CYCLECOUNT_STATUS_REGISTERED)) {
+                continue;
+            }
             Result result = cycleCountDetailChildService.confirmGapQty(String.valueOf(id), String.valueOf(countedQty), null);
             if (!result.isSuccess()) {
                 throw new JeecgBootException(result.getMessage());
             }
         }
-        return Result.ok("批量实盘登记成功");
+        return Result.OK(headerId);
     }
  
     /**
@@ -36,12 +36,12 @@ public class CycleCountDetailChild implements Serializable {
     @ApiModelProperty(value = "盘点主单code")
     private String cyclecountheadcode;
     /** 盘点明细ID主id */
-    @ApiModelProperty(value = "盘点明细ID主id")
+    @ApiModelProperty(value = "盘点明细ID")
     private Integer cycleCountDetailid;
     /** 盘点明细子单状态 */
     @Excel(name = "盘点明细子单状态", width = 15)
     @ApiModelProperty(value = "盘点明细子单状态")
-    @Dict(dicCode = "cyclecount_status")
+    @Dict(dicCode = "cycleCount_status")
     private Integer childStatus;
     /** 库区类型 */
     @Excel(name = "库区类型", width = 15)
@@ -237,9 +237,9 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl&lt;CycleCountDeta
             if (child.getCountedQty() == null) {
                 continue;
             }
-            if (child.getCountedQty().compareTo(BigDecimal.ZERO) == 0) {
-                continue;
-            }
+//            if (child.getCountedQty().compareTo(BigDecimal.ZERO) == 0) {
+//                continue;
+//            }
             String toLocationCode = inventoryHeader.getLocationCode();
             String warehouseCode = cycleCountHeader.getWarehouseCode();
             String companyCode = cycleCountHeader.getCompanyCode();
@@ -430,10 +430,17 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl&lt;CycleCountDeta
             }
         }
  
-        if (inventoryHeader.getTotalQty().compareTo(BigDecimal.ZERO) < 1) {
-            success = inventoryHeaderService.removeById(inventoryHeader.getId());
-            if (!success) {
-                throw new JeecgBootException("完成盘点任务时, 删除库存头失败");
+        List<InventoryDetail> inventoryDetailList =
+            inventoryDetailService.getInventoryDetailListByContainerCode(inventoryHeader.getContainerCode(), inventoryHeader.getWarehouseCode());
+        if (inventoryDetailList.size() != 0) {
+            if (!taskHeaderService.combineInventoryDetail(inventoryHeader.getContainerCode(), inventoryHeader.getWarehouseCode())) {
+                throw new JeecgBootException("扣减库存失败, 合并入库库存失败");
+            }
+        } else {
+            if (inventoryHeader != null) {
+                if (!inventoryHeaderService.removeById(inventoryHeader.getId())) {
+                    throw new JeecgBootException("扣减库存失败, 删除库存失败");
+                }
             }
         }
  
@@ -455,9 +462,6 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl&lt;CycleCountDeta
  
         // 更新主单状态
         cycleCountHeaderService.updataHeaderStatus(cycleCountDetail.getCycleCountHeadCode());
-        if (!taskHeaderService.combineInventoryDetail(inventoryHeader.getContainerCode(), inventoryHeader.getWarehouseCode())) {
-            throw new JeecgBootException("完成盘点任务时, 更新库存失败");
-        }
         return Result.ok("完成盘点任务成功");
     }
 }
@@ -424,9 +424,8 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         if (cycleCountDetail == null) {
             return Result.error("盘点明细不存在");
         }
-
+        String zoneType = cycleCountDetail.getZoneType();
         if (cycleCountDetail.getEnableStatus().equals(QuantityConstant.CYCLECOUNT_STATUS_BUILD)) {
-            String zoneType = cycleCountDetail.getZoneType();
             if (!zoneType.equals(QuantityConstant.ZONE_TYPE_FLAT)) {
                 return Result.error("当前盘点明细是新建状态 不能调整");
             }
@@ -460,6 +459,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         cycleCountDetailChild.setSystemQty(BigDecimal.ZERO);
         cycleCountDetailChild.setGapQty(countedQty);
         cycleCountDetailChild.setCountedQty(countedQty);
+        cycleCountDetailChild.setZoneType(zoneType);
         cycleCountDetailChildServiceImpl.save(cycleCountDetailChild);
  
         Result<Integer> result = new Result<Integer>();
@@ -18,4 +18,6 @@ public interface ICycleCountHeaderService extends IService&lt;CycleCountHeader&gt; {
     void updataHeaderStatus(String cycleCountHeadCode);
  
     Result cancelCycleHeader(String ids);
+
+    CycleCountHeader getCycleCountHeaderByCode(String cycleHeaderCode);
 }
@@ -126,6 +126,14 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         return Result.ok("删除盘点单成功");
     }
  
+    @Override
+    public CycleCountHeader getCycleCountHeaderByCode(String cycleHeaderCode) {
+        LambdaQueryWrapper<CycleCountHeader> cycleCountHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        cycleCountHeaderLambdaQueryWrapper.eq(CycleCountHeader::getCode, cycleHeaderCode);
+        CycleCountHeader cycleCountHeader = getOne(cycleCountHeaderLambdaQueryWrapper);
+        return cycleCountHeader;
+    }
+
     @Transactional
     public String createCode(String receiptType) {
         String code = null;