增加批量实盘登记

肖超群
1 parent 1904e1f5
Showing 7 changed files with 298 additions and 14 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountDetailList.vue
ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountConfirmModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentDetailServiceImpl.java
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/service/impl/CycleCountDetailChildServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
@@ -314,6 +314,8 @@ export const getInventoryDetailByLocationCode = (params) =&gt; getAction(&#39;/inventor
 export const quickShipment = (params) => postAction("/task/taskHeader/quickShipment", params);
 //出库复核
 export const shipmentCheck = (params) => postAction("/shipment/shipmentCombination/shipmentCheck", params);
+//查询盘点明细子表
+export const listCycleDetailChildByDetailId = (params) => postAction("/cycleCountDetail/cycleCountDetail/listCycleDetailChildByDetailId", params);
  
 // 中转HTTP请求
 export const transitRESTful = {
@@ -74,13 +74,12 @@
         </template>
         <template slot="action" slot-scope="text, record">
           <cycle-count-detail-chi-id-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id"/>
-          <a v-if="record.enableStatus != '100'" @click="createMany()"><a-icon/>新增</a>
-          <a-divider type="vertical"/>
+          <a v-if="record.enableStatus != '100'" @click="createMany()"><a-icon/>新增 <a-divider type="vertical"/></a>
           <a-popconfirm v-if="record.enableStatus === 1" v-has="'cycleCountHeader:delete'" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除 <a-divider type="vertical"/> </a>
           </a-popconfirm>
           <a v-if="record.enableStatus == '1' && record.zoneType == 'L'"  @click="selectPort(record)">生成盘点任务 <a-divider type="vertical"/></a>
-
+          <a v-if="record.enableStatus != '100'" @click="cycleConfirm(record.id)"><a-icon/>盘点登记 <a-divider type="vertical"/></a>
           <a @click="loadDatas(record.cycleCountHeadId)"><a-icon type="sync"/>刷新</a>
         </template>
  
@@ -92,6 +91,7 @@
  
     <cycle-count-select-modal ref="modalForm2"></cycle-count-select-modal>
     <cycle-count-detail-modal ref="modalForm" @ok="modalFormOk"/>
+    <cycle-count-confirm-modal ref="modalForm3" @ok="modalFormOk"/>
  
   </a-card>
 </template>
@@ -107,12 +107,14 @@
   import {createCycleCoutTaskByDetailId, stockTakeTask} from "@/api/api";
   import Utils from "../../../components/jeecgbiz/JButtonBizComponent/util.js"
   import CycleCountDetailChiIdModal from "./modules/CycleCountDetailChiIdModal";
+  import CycleCountConfirmModal from "@views/system/stocktaking/modules/CycleCountConfirmModal.vue";
  
   export default {
     name: 'CycleCountDetailList',
     cycleCountDetailId:'',
     mixins: [JeecgListMixin],
     components: {
+      CycleCountConfirmModal,
       CycleCountDetailModal,
       CycleCountDetailChildSubTable,
       CycleCountSelectModal,
@@ -353,6 +355,11 @@
         this.$refs.adjustmentModal.edit();
         this.$refs.adjustmentModal.title = "新增";
       },
+
+      cycleConfirm(record) {
+        this.$refs.modalForm3.edit(record);
+        this.$refs.modalForm3.title = "盘点登记";
+      },
     }
   }
 </script>
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+
+    <a-spin :spinning="confirmLoading">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
+
+      </a-form-model>
+    </a-spin>
+
+    <a-table ref="table" rowKey="id" size="middle" :columns="columns" :dataSource="dataSource" :pagination="false">
+      <span slot="action" slot-scope="text, record">
+        <a-input-number placeholder="" v-model="record.countedQty" :value="text" />
+      </span>
+
+
+      <span slot="inventoryStatus" slot-scope="inventoryStatus">
+        <a-tag :key="inventoryStatus" color="blue" :color="getStatusColor(inventoryStatus)">
+          {{ solutionInvStatus(inventoryStatus) }}
+        </a-tag>
+      </span>
+
+    </a-table>
+  </j-modal>
+
+</template>
+
+<script>
+import { httpAction } from '@/api/manage'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import { validateDuplicateValue } from '@/utils/util'
+import {listCycleDetailChildByDetailId, queryCycleCountDetailChildByMainId, searchMaterialByCode} from '@/api/api'
+import { listReceiveByReceiveId,ajaxGetDictItems } from '@/api/api'
+
+export default {
+  name: 'CycleCountConfirmModal',
+  components: {},
+  props: {
+    mainId: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      title: '操作',
+      width: 800,
+      visible: false,
+      materialList: {},
+      querySource: {},
+      dataSource: [],
+      invStatus:[],
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      columns: [
+        {
+          title: '物料编码',
+          dataIndex: 'materialCode',
+          align: 'center',
+          width: 124
+        },
+        {
+          title: '物料名称',
+          dataIndex: 'materialName',
+          align: 'center',
+          width: 96
+        },
+        {
+          title: '库存状态',
+          dataIndex: 'inventoryStatus',
+          align: 'center',
+          width: 96,
+          scopedSlots: {customRender: 'inventoryStatus'}
+        },
+        {
+          title: '批次',
+          dataIndex: 'batch',
+          align: 'center'
+        },
+        {
+          title: '系统数量',
+          dataIndex: 'systemQty',
+          align: 'center',
+          width: 80
+        },
+        {
+          title: '实盘数量',
+          dataIndex: 'countedQty',
+          align: 'center',
+          key: 'countedQty',
+          scopedSlots: { customRender: 'action' }
+        },
+      ],
+      confirmLoading: false,
+      validatorRules: {
+        containerCode: [{ required: true, message: '请输入容器编码!' }]
+      },
+      dictOptions: {},
+      superFieldList:[],
+      url: {
+        batchConfirmGapQty: '/cycleCountDetail/cycleCountDetail/batchConfirmGapQty',
+      }
+    }
+  },
+  created() {
+    //备份model原始值
+    this.getSuperFieldList()
+    // this.modelDefault = JSON.parse(JSON.stringify(this.model))
+    this.loadFrom();
+  },
+  methods: {
+    loadFrom(){
+      ajaxGetDictItems('inventory_status').then((res) => {
+        if (res.success) {
+          this.invStatus = res.result
+        }
+      })
+    },
+    getStatusColor(status) {
+      const colors = {
+        'good ': 'green',
+        'defective': 'red',
+        'discussed	': 'grey',
+        'scrap': 'purple',
+        default: 'blue'
+      };
+      return colors[status] || colors.default;
+    },
+    getContainerCode(e){
+      this.$nextTick(function (){
+        let  record={containerCode: e}
+        this.model = Object.assign({}, record)
+      })
+    },
+    solutionInvStatus(value) {
+      var actions = []
+      Object.keys(this.invStatus).some(key => {
+        if (this.invStatus[key].value == '' + value) {
+          actions.push(this.invStatus[key].text)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+
+    edit(record) {
+      this.model = Object.assign({}, record)
+      this.visible = true
+      this.searchCycle(record);
+    },
+
+    selectContainer(record){
+      this.$refs.selectContainerForm.edit(record);
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.$refs.form.clearValidate()
+    },
+    searchCycle(record) {
+      console.log("searchCycle  " + record);
+      const that = this
+      that.querySource.id = record;
+      listCycleDetailChildByDetailId(that.querySource).then(res => {
+        that.dataSource = res.result
+      })
+    },
+    initDictConfig() {},
+    getSuperFieldList() {
+      let fieldList = []
+      fieldList.push({type:'string',value:'inventoryStatus',text:'库存状态',dictCode:'inventory_status'})
+      this.superFieldList = fieldList
+    },
+    handleOk() {
+      console.log('handleOk')
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          httpurl += this.url.batchConfirmGapQty
+          method = 'post'
+          if (this.dataSource[0] == null) {
+            that.confirmLoading = false
+            that.$message.warning('没有盘点明细！')
+            return
+          }
+          httpAction(httpurl, this.dataSource, method)
+            .then(res => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+                that.close()
+              } else {
+                that.$message.warning(res.message)
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false
+            })
+        } else {
+          return false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    }
+  }
+}
+</script>
@@ -217,13 +217,13 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
         }
     }
  
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    public Result removeDetailListById(List<String> idList) {
-//        Result result = null;
-//        for (String id : idList) {
-//            result = shipmentHeaderService.deleteShipmentDetail(id);
-//        }
-//        return result;
-//    }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result removeDetailListById(List<String> idList) {
+        Result result = null;
+        for (String id : idList) {
+            result = shipmentHeaderService.deleteShipmentDetail(id);
+        }
+        return result;
+    }
 }
 package org.jeecg.modules.wms.stocktaking.cycleCountDetail.controller;
  
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -14,6 +15,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
@@ -49,6 +51,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  
@@ -271,6 +274,30 @@ public class CycleCountDetailController extends HuahengBaseController {
     }
  
     /**
+     * 实盘登记
+     * @return
+     */
+    @PostMapping("/batchConfirmGapQty")
+    @ResponseBody
+    public Result batchConfirmGapQty(@RequestBody List<CycleCountDetail> cycleCountDetailList) {
+        if (CollectionUtils.isEmpty(cycleCountDetailList)) {
+            return Result.error("批量实盘登记失败参数为空");
+        }
+        for (CycleCountDetail cycleCountDetail : cycleCountDetailList) {
+            int id = cycleCountDetail.getId();
+            BigDecimal countedQty = cycleCountDetail.getCountedQty();
+            if (countedQty == null) {
+                throw new JeecgBootException("批量实盘登记失败参数为空");
+            }
+            Result result = cycleCountDetailChildService.confirmGapQty(String.valueOf(id), String.valueOf(countedQty), null);
+            if (!result.isSuccess()) {
+                throw new JeecgBootException(result.getMessage());
+            }
+        }
+        return Result.ok("批量实盘登记成功");
+    }
+
+    /**
      * 通过id查询
      * @param  id
      * @return
@@ -288,6 +315,15 @@ public class CycleCountDetailController extends HuahengBaseController {
         return Result.OK(page);
     }
  
+    @PostMapping("/listCycleDetailChildByDetailId")
+    @ResponseBody
+    public Result listCycleDetailChildByDetailId(@RequestBody CycleCountDetail cycleCountDetail) {
+        LambdaQueryWrapper<CycleCountDetailChild> cycleCountDetailChildLambdaQueryWrapper = Wrappers.lambdaQuery();
+        cycleCountDetailChildLambdaQueryWrapper.eq(CycleCountDetailChild::getCycleCountDetailid, cycleCountDetail.getId());
+        List<CycleCountDetailChild> cycleCountDetailChildList = cycleCountDetailChildService.list(cycleCountDetailChildLambdaQueryWrapper);
+        return Result.OK(cycleCountDetailChildList);
+    }
+
     /**
      * 导出excel
      * @param request
@@ -105,6 +105,9 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl&lt;CycleCountDeta
         if (StringUtils.isEmpty(zoneType)) {
             return Result.error("实盘登记, 盘点明细" + id + "库区类型为空！");
         }
+        if (countedQty == null) {
+            return Result.error("实盘登记数不能为空");
+        }
         BigDecimal qty = new BigDecimal(countedQty);
         if (qty.compareTo(BigDecimal.ZERO) == -1) {
             return Result.error("实盘登记数不能小于0");
@@ -145,7 +148,9 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl&lt;CycleCountDeta
         BigDecimal ystem_qty = new BigDecimal(0);
         BigDecimal gap_qty = new BigDecimal(0);
         for (CycleCountDetailChild cycleCountDetailChild : cycleCountDetailChildList) {
-            counted_qty = counted_qty.add(cycleCountDetailChild.getCountedQty());
+            if (cycleCountDetailChild.getCountedQty() != null) {
+                counted_qty = counted_qty.add(cycleCountDetailChild.getCountedQty());
+            }
             ystem_qty = ystem_qty.add(cycleCountDetailChild.getSystemQty());
             gap_qty = gap_qty.add(cycleCountDetailChild.getGapQty());
         }
@@ -229,6 +234,9 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl&lt;CycleCountDeta
             if (child.getChildStatus().equals(QuantityConstant.CYCLECOUNT_STATUS_COMPLETED)) {
                 continue;
             }
+            if (child.getCountedQty() == null) {
+                continue;
+            }
             if (child.getCountedQty().compareTo(BigDecimal.ZERO) == 0) {
                 continue;
             }
@@ -243,7 +243,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
                 cycleCountDetailChild.setBatch(inventoryDetail.getBatch());
                 cycleCountDetailChild.setLot(inventoryDetail.getLot());
                 cycleCountDetailChild.setSystemQty(inventoryDetail.getQty());
-                cycleCountDetailChild.setCountedQty(BigDecimal.ZERO);
+//                cycleCountDetailChild.setCountedQty(BigDecimal.ZERO);
                 cycleCountDetailChild.setGapQty(BigDecimal.ZERO);
                 cycleCountDetailChild.setInventoryDetaiId(inventoryDetail.getId());
                 cycleCountDetailChildServiceImpl.save(cycleCountDetailChild);