增加库存新增功能

肖超群
1 parent 48308bd0
Showing 10 changed files with 307 additions and 11 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryDetailAddModal.vue
ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryDetailModifyModal.vue
ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryTogetherModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wms/entity/WmsEntity.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/IInventoryDetailService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java
@@ -306,8 +306,10 @@ export const flatReceipt = (params) =&gt; postAction(&#39;/receipt/receiveHeader/flatRe
 export const createSerialMaterial = (params) => postAction('/config/materialSn/batchAdd', params);
 //合托
 export const batchCreateCheckOut = (params) => postAction('/task/taskHeader/batchCreateCheckOut', params);
-//增加库存数量
+//增加库存
 export const addInventoryDetail = (params) => postAction('/inventory/inventoryDetail/addInventoryDetail', params);
+//增加库存数量
+export const increaseInventoryDetail = (params) => postAction('/inventory/inventoryDetail/increaseInventoryDetail', params);
 //扣减库存数量
 export const reduceInventoryDetail = (params) => postAction('/inventory/inventoryDetail/reduceInventoryDetail', params);
 // 根据库位编码查询库存详情
@@ -79,7 +79,8 @@
  
         <span slot="action" slot-scope="text, record">
           <a v-has="'inventoryDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
-          <a v-has="'inventoryDetail:addInventoryDetail'" v-if="(record.containerStatus == 'lock')" @click="addInventoryDetail(record)">新增数量<a-divider type="vertical"/></a>
+          <a v-has="'inventoryDetail:addInventoryDetail'" v-if="(record.containerStatus == 'lock')" @click="addInventoryDetail(record)">新增物料 <a-divider type="vertical"/></a>
+          <a v-has="'inventoryDetail:addInventoryDetail'" v-if="(record.containerStatus == 'lock')" @click="increaseInventoryDetail(record)">新增数量<a-divider type="vertical"/></a>
           <a v-has="'inventoryDetail:reduceInventoryDetail'" v-if="(record.containerStatus == 'lock')" @click="reduceInventoryDetail(record)">减少数量<a-divider type="vertical"/></a>
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a v-has="'inventoryDetail:delete'">删除</a>
@@ -88,6 +89,7 @@
       </a-table>
     </div>
  
+    <inventory-detail-add-modal ref="detailModalForm" @ok="modalFormOk" :mainId="mainId"></inventory-detail-add-modal>
     <inventoryDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></inventoryDetail-modal>
     <inventory-detail-modify-modal ref="modifyModalForm" @ok="modalFormOk" :mainId="mainId"></inventory-detail-modify-modal>
   </a-card>
@@ -98,11 +100,12 @@ import {JeecgListMixin} from &#39;@/mixins/JeecgListMixin&#39;
 import InventoryDetailModal from './modules/InventoryDetailModal'
 import {getCompanyList, getZoneList} from '@/api/api'
 import InventoryDetailModifyModal from "@views/system/inventory/modules/InventoryDetailModifyModal.vue";
+import InventoryDetailAddModal from "@views/system/inventory/modules/InventoryDetailAddModal.vue";
  
 export default {
   name: 'InventoryDetailList',
   mixins: [JeecgListMixin],
-  components: {InventoryDetailModifyModal, InventoryDetailModal},
+  components: {InventoryDetailAddModal, InventoryDetailModifyModal, InventoryDetailModal},
   props: {
     mainId: {
       type: String,
@@ -313,6 +316,10 @@ export default {
       })
     },
     addInventoryDetail(record) {
+      this.$refs.detailModalForm.edit(record);
+      this.$refs.detailModalForm.title = "新增物料";
+    },
+    increaseInventoryDetail(record) {
       this.$refs.modifyModalForm.edit(record);
       this.$refs.modifyModalForm.title = "增加库存数量";
       this.$refs.modifyModalForm.flag = 1;
+<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-row>
+          <a-col :span="24">
+            <a-form-model-item label="物料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
+              <j-search-select-tag
+                v-model="model.materialCode"
+                dict="material,name,code"
+                placeholder="请选择物料编码"
+                :pageSize="10"
+                :async="true"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qty">
+              <a-input-number v-model="model.qty" placeholder="请输入数量" style="width: 100%"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+
+import {httpAction} from '@/api/manage'
+import {validateDuplicateValue} from '@/utils/util'
+import {addInventoryDetail} from "@api/api";
+
+export default {
+  name: "InventoryDetailAddModal",
+  components: {},
+  props: {
+    mainId: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      title: "操作",
+      width: 400,
+      visible: false,
+      model: {},
+      flag: 0,
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5},
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 16},
+      },
+
+      confirmLoading: false,
+      validatorRules: {
+        qty: [{required: true, message: '请输入数量!'}],
+      },
+      url: {
+        add: "/inventory/inventoryHeader/addInventoryDetail",
+        edit: "/inventory/inventoryHeader/editInventoryDetail",
+      }
+
+    }
+  },
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record);
+      this.model.qty = 0;
+      this.visible = true;
+    },
+    close() {
+      this.$emit('close');
+      this.visible = false;
+      this.$refs.form.clearValidate();
+    },
+    handleOk() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true;
+          this.model['inventoryHeaderId'] = this.mainId
+            addInventoryDetail(this.model).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit('ok');
+              } else {
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+        } else {
+          return false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+
+
+  }
+}
+</script>
@@ -26,7 +26,7 @@
  
 import {httpAction} from '@/api/manage'
 import {validateDuplicateValue} from '@/utils/util'
-import {addInventoryDetail, reduceInventoryDetail} from "@api/api";
+import {increaseInventoryDetail, reduceInventoryDetail} from "@api/api";
  
 export default {
   name: "InventoryDetailModifyModal",
@@ -91,7 +91,7 @@ export default {
           that.confirmLoading = true;
           this.model['inventoryHeaderId'] = this.mainId
           if (this.flag == 1) {
-            addInventoryDetail(this.model).then((res) => {
+            increaseInventoryDetail(this.model).then((res) => {
               if (res.success) {
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -100,9 +100,9 @@ export default {
         } else {
           this.$message.error(res.message);
         }
+        this.$emit("ok");
+        this.close()
       });
-      this.$emit("ok", this.model.outPortCode);
-      this.close()
     },
     handleCancel() {
       this.close()
@@ -176,6 +176,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         if (CollectionUtils.isEmpty(roadWays)) {
             throw new JeecgBootException("分配库位时, 可用巷道为空");
         }
+        roadWays = locationService.getRoadWayByZoneCode(zoneCode, warehouseCode);
         Integer roadWay = locationAllocationService.getRoadWay(roadWays, materialCode, zoneCode, warehouseCode);
         // 优先找外侧库位
         LambdaQueryWrapper<Location> locationLambda = Wrappers.lambdaQuery();
@@ -12,6 +12,7 @@ public class WmsEntity {
     private String containerCode;
     private String remark;
     private String warehouseCode;
+    private String fromPort;
     private String toPort;
     private List<WmsInventory> wmsInventoryList;
  
@@ -280,9 +280,21 @@ public class InventoryDetailController extends JeecgController&lt;InventoryDetail, 
     @ApiOperation(value = "库存详情-新增库存数量", notes = "库存详情-新增库存数量")
     @RequestMapping(value = "/addInventoryDetail", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result addInventoryDetail(@RequestBody InventoryDetail inventoryDetail) {
+        return inventoryDetailService.addInventoryDetail(inventoryDetail);
+    }
+
+    /**
+     * 新增库存数量
+     * @param  inventoryDetail
+     * @return
+     */
+    @AutoLog(value = "库存详情-新增库存数量")
+    @ApiOperation(value = "库存详情-新增库存数量", notes = "库存详情-新增库存数量")
+    @RequestMapping(value = "/increaseInventoryDetail", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result increaseInventoryDetail(@RequestBody InventoryDetail inventoryDetail) {
         InventoryDetail inventoryDetail1 = inventoryDetailService.getById(inventoryDetail.getId());
         BigDecimal qty = inventoryDetail.getQty();
-        return inventoryDetailService.addInventoryDetail(inventoryDetail1, qty);
+        return inventoryDetailService.increaseInventoryDetail(inventoryDetail1, qty);
     }
  
     /**
@@ -127,7 +127,15 @@ public interface IInventoryDetailService extends IService&lt;InventoryDetail&gt; {
      * @param  inventoryDetail 库存详情
      * @return
      */
-    Result addInventoryDetail(InventoryDetail inventoryDetail, BigDecimal qty);
+    Result addInventoryDetail(InventoryDetail inventoryDetail);
+
+    /**
+     * 进行出库查看时,可以增加库存数量
+     * 添加库存详情
+     * @param  inventoryDetail 库存详情
+     * @return
+     */
+    Result increaseInventoryDetail(InventoryDetail inventoryDetail, BigDecimal qty);
  
     /**
      * 进行出库查看时,可以减少库存数量
@@ -17,8 +17,15 @@ import org.jeecg.modules.wms.config.container.entity.Container;
 import org.jeecg.modules.wms.config.container.service.IContainerService;
 import org.jeecg.modules.wms.config.containerCapacity.entity.ContainerCapacity;
 import org.jeecg.modules.wms.config.containerCapacity.service.IContainerCapacityService;
+import org.jeecg.modules.wms.config.location.entity.Location;
+import org.jeecg.modules.wms.config.location.service.ILocationService;
+import org.jeecg.modules.wms.config.material.entity.Material;
+import org.jeecg.modules.wms.config.material.service.IMaterialService;
 import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
+import org.jeecg.modules.wms.config.zone.entity.Zone;
+import org.jeecg.modules.wms.config.zone.service.IZoneService;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
+import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryHeader;
 import org.jeecg.modules.wms.inventory.inventoryHeader.mapper.InventoryDetailMapper;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryHeaderService;
@@ -86,6 +93,12 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
     private IShipmentContainerDetailService shipmentContainerDetailService;
     @Resource
     private IInventoryTransactionService inventoryTransactionService;
+    @Resource
+    private IMaterialService materialService;
+    @Resource
+    private IZoneService zoneService;
+    @Resource
+    private ILocationService locationService;
  
     @Override
     public List<InventoryDetail> selectByMainId(String mainId) {
@@ -458,7 +471,88 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result addInventoryDetail(InventoryDetail inventoryDetail, BigDecimal qty) {
+    public Result addInventoryDetail(InventoryDetail inventoryDetail1) {
+        String materialCode = inventoryDetail1.getMaterialCode();
+        BigDecimal qty = inventoryDetail1.getQty();
+        if (StringUtils.isEmpty(materialCode)) {
+            return Result.error("增加库存，没有物料编码");
+        }
+        if (qty == null) {
+            return Result.error("增加库存，没有数量");
+        }
+        Material material = materialService.getMaterialByCode(materialCode);
+        if (material == null) {
+            return Result.error("增加库存，没有找到物料" + materialCode);
+        }
+        InventoryHeader inventoryHeader = inventoryHeaderService.getById(inventoryDetail1.getInventoryHeaderId());
+        if (inventoryHeader == null) {
+            return Result.error("增加库存，没有找到库存" + inventoryDetail1.getInventoryHeaderId());
+        }
+        String zoneCode = inventoryHeader.getZoneCode();
+        String warehouseCode = inventoryHeader.getWarehouseCode();
+        String companyCode = inventoryHeader.getCompanyCode();
+        String containerCode = inventoryHeader.getContainerCode();
+        String locationCode = inventoryHeader.getLocationCode();
+        Zone zone = zoneService.getZoneByCode(zoneCode, warehouseCode);
+        if (zone == null) {
+            return Result.error("增加库存，没有找到库区" + zoneCode);
+        }
+        Location location = locationService.getLocationByCode(locationCode, warehouseCode);
+        if (location == null) {
+            return Result.error("增加库存，没有找到库位" + locationCode);
+        }
+        Integer roadWay = location.getRoadWay();
+        String zoneType = zone.getType();
+        InventoryDetail inventoryDetail = new InventoryDetail();
+        inventoryDetail.setInventoryHeaderId(inventoryHeader.getId());
+        inventoryDetail.setWarehouseCode(warehouseCode);
+        inventoryDetail.setCompanyCode(companyCode);
+        inventoryDetail.setZoneCode(zoneCode);
+        inventoryDetail.setZoneType(zoneType);
+        inventoryDetail.setContainerCode(containerCode);
+        inventoryDetail.setContainerStatus(QuantityConstant.STATUS_CONTAINER_LOCK);
+        inventoryDetail.setLocationCode(locationCode);
+        inventoryDetail.setMaterialCode(material.getCode());
+        inventoryDetail.setMaterialName(material.getName());
+        inventoryDetail.setMaterialSpec(material.getSpec());
+        inventoryDetail.setMaterialUnit(material.getUnit());
+        inventoryDetail.setQty(qty);
+        inventoryDetail.setRoadWay(roadWay);
+        inventoryDetail.setInventoryStatus(QuantityConstant.QUALITY_GOOD);
+        inventoryDetail.setReceiptDate(new Date());
+        if (!inventoryDetailService.save(inventoryDetail)) {
+            throw new JeecgBootException("增加库存，新增库存详情失败");
+        }
+
+        InventoryTransaction inventoryTransaction = new InventoryTransaction();
+        inventoryTransaction.setType(QuantityConstant.INVENTORY_TRANSACTION_CYCLEINTO);
+        inventoryTransaction.setWarehouseCode(inventoryHeader.getWarehouseCode());
+        inventoryTransaction.setCompanyCode(inventoryDetail.getCompanyCode());
+        inventoryTransaction.setContainerCode(inventoryHeader.getContainerCode());
+        inventoryTransaction.setZoneCode(zoneCode);
+        inventoryTransaction.setToLocationCode(inventoryDetail.getLocationCode());
+        inventoryTransaction.setMaterialCode(inventoryDetail.getMaterialCode());
+        inventoryTransaction.setMaterialName(inventoryDetail.getMaterialName());
+        inventoryTransaction.setMaterialSpec(inventoryDetail.getMaterialSpec());
+        inventoryTransaction.setMaterialUnit(inventoryDetail.getMaterialUnit());
+        inventoryTransaction.setInventoryStatus(inventoryDetail.getInventoryStatus());
+        inventoryTransaction.setBatch(inventoryDetail.getBatch());
+        inventoryTransaction.setLot(inventoryDetail.getLot());
+        inventoryTransaction.setProject(inventoryDetail.getProject());
+        inventoryTransaction.setQty(qty);
+        inventoryTransaction.setReceiptQty(qty);
+        if (!inventoryTransactionService.save(inventoryTransaction)) {
+            throw new JeecgBootException("增加库存, 保存库存交易记录失败");
+        }
+        if (!taskHeaderService.combineInventoryDetail(inventoryHeader.getContainerCode(), inventoryHeader.getWarehouseCode())) {
+            throw new JeecgBootException("增加库存，合并数量托盘：" + inventoryHeader.getContainerCode() + "调整库存失败");
+        }
+        return Result.OK("增加库存，托盘：" + inventoryHeader.getContainerCode() + "调整库存成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result increaseInventoryDetail(InventoryDetail inventoryDetail, BigDecimal qty) {
         String containerCode = inventoryDetail.getContainerCode();
         String warehouseCode = inventoryDetail.getWarehouseCode();
         TaskHeader taskHeader = taskHeaderService.getUnCompleteTaskByContainerCode(containerCode, warehouseCode);
@@ -472,6 +566,27 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
         if (qty.compareTo(BigDecimal.ZERO) <= 0) {
             return Result.error("调整库存，托盘：" + containerCode + "调整数量必须大于0");
         }
+        InventoryTransaction inventoryTransaction = new InventoryTransaction();
+        inventoryTransaction.setType(QuantityConstant.INVENTORY_TRANSACTION_CYCLEINTO);
+        inventoryTransaction.setWarehouseCode(warehouseCode);
+        inventoryTransaction.setCompanyCode(inventoryDetail.getCompanyCode());
+        inventoryTransaction.setContainerCode(containerCode);
+        inventoryTransaction.setZoneCode(inventoryDetail.getZoneCode());
+        inventoryTransaction.setFromLocationCode(taskHeader.getFromLocationCode());
+        inventoryTransaction.setToLocationCode(taskHeader.getToLocationCode());
+        inventoryTransaction.setMaterialCode(inventoryDetail.getMaterialCode());
+        inventoryTransaction.setMaterialName(inventoryDetail.getMaterialName());
+        inventoryTransaction.setMaterialSpec(inventoryDetail.getMaterialSpec());
+        inventoryTransaction.setMaterialUnit(inventoryDetail.getMaterialUnit());
+        inventoryTransaction.setInventoryStatus(inventoryDetail.getInventoryStatus());
+        inventoryTransaction.setBatch(inventoryDetail.getBatch());
+        inventoryTransaction.setLot(inventoryDetail.getLot());
+        inventoryTransaction.setProject(inventoryDetail.getProject());
+        inventoryTransaction.setQty(qty);
+        inventoryTransaction.setReceiptQty(qty);
+        if (!inventoryTransactionService.save(inventoryTransaction)) {
+            throw new JeecgBootException("调整库存, 保存库存交易记录失败");
+        }
         BigDecimal inventoryDetailQty = inventoryDetail.getQty();
         inventoryDetailQty = inventoryDetailQty.add(qty);
         inventoryDetail.setQty(inventoryDetailQty);
@@ -506,6 +621,27 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
         if (inventoryDetailQty.compareTo(BigDecimal.ZERO) < 0) {
             return Result.error("调整库存，托盘：" + containerCode + "调整后的数量不能小于0");
         }
+        InventoryTransaction inventoryTransaction = new InventoryTransaction();
+        inventoryTransaction.setType(QuantityConstant.INVENTORY_TRANSACTION_CYCLEOUT);
+        inventoryTransaction.setWarehouseCode(warehouseCode);
+        inventoryTransaction.setCompanyCode(inventoryDetail.getCompanyCode());
+        inventoryTransaction.setContainerCode(containerCode);
+        inventoryTransaction.setZoneCode(inventoryDetail.getZoneCode());
+        inventoryTransaction.setFromLocationCode(taskHeader.getFromLocationCode());
+        inventoryTransaction.setToLocationCode(taskHeader.getToLocationCode());
+        inventoryTransaction.setMaterialCode(inventoryDetail.getMaterialCode());
+        inventoryTransaction.setMaterialName(inventoryDetail.getMaterialName());
+        inventoryTransaction.setMaterialSpec(inventoryDetail.getMaterialSpec());
+        inventoryTransaction.setMaterialUnit(inventoryDetail.getMaterialUnit());
+        inventoryTransaction.setInventoryStatus(inventoryDetail.getInventoryStatus());
+        inventoryTransaction.setBatch(inventoryDetail.getBatch());
+        inventoryTransaction.setLot(inventoryDetail.getLot());
+        inventoryTransaction.setProject(inventoryDetail.getProject());
+        inventoryTransaction.setQty(qty);
+        inventoryTransaction.setShipmentQty(qty);
+        if (!inventoryTransactionService.save(inventoryTransaction)) {
+            throw new JeecgBootException("调整库存, 保存库存交易记录失败");
+        }
         if (inventoryDetailQty.compareTo(BigDecimal.ZERO) == 0) {
             if (!removeById(inventoryDetail.getId())) {
                 throw new JeecgBootException("调整库存，托盘：" + containerCode + "调整库存失败");
@@ -525,8 +661,10 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
             if (!success) {
                 throw new JeecgBootException("调整库存，托盘：" + containerCode + "调整库存失败");
             }
+            if (!taskHeaderService.combineInventoryDetail(containerCode, warehouseCode)) {
+                throw new JeecgBootException("调整库存，合并数量托盘：" + containerCode + "调整库存失败");
+            }
         }
-
         return Result.OK("调整库存，托盘：" + containerCode + "调整库存成功");
     }