调整生成入库任务

肖超群
1 parent dd89a4ad
Showing 5 changed files with 31 additions and 27 deletions
ant-design-vue-jeecg/src/views/system/inventory/InventoryAgeAlarmList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryLevelAlarmList.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/entity/Port.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -196,16 +196,16 @@ export default {
           dataIndex: 'daystoexpire',
           scopedSlots: {customRender: 'daystoexpire'}
         },
-        {
-          title: '仓库编码',
-          align: "center",
-          dataIndex: 'warehouseCode'
-        },
-        {
-          title: '货主编码',
-          align: "center",
-          dataIndex: 'companyCode'
-        }
+        // {
+        //   title: '仓库编码',
+        //   align: "center",
+        //   dataIndex: 'warehouseCode'
+        // },
+        // {
+        //   title: '货主编码',
+        //   align: "center",
+        //   dataIndex: 'companyCode'
+        // }
       ],
       url: {
         list: "/inventory/inventoryAge/list",
@@ -202,16 +202,16 @@ export default {
           align: "center",
           dataIndex: 'materialUnit'
         },
-        {
-          title: '仓库编码',
-          align: "center",
-          dataIndex: 'warehouseCode'
-        },
-        {
-          title: '货主编码',
-          align: "center",
-          dataIndex: 'companyCode'
-        },
+        // {
+        //   title: '仓库编码',
+        //   align: "center",
+        //   dataIndex: 'warehouseCode'
+        // },
+        // {
+        //   title: '货主编码',
+        //   align: "center",
+        //   dataIndex: 'companyCode'
+        // },
         {
           title: '备注',
           align: "center",
@@ -128,10 +128,10 @@
           </a-button>
         </template>selectPort
         <span slot="action" slot-scope="text, record">
-          <a v-if="record.status == 0 && record.taskType == 200" @click="selectFillPort(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
-          <a v-else-if="record.status == 0" @click="selectContainerStatus(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
-<!--          <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
-<!--          <a v-else-if="record.status == 0" @click="createTask(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
+<!--          <a v-if="record.status == 0 && record.taskType == 200" @click="selectFillPort(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
+<!--          <a v-else-if="record.status == 0" @click="selectContainerStatus(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
+          <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
+          <a v-else-if="record.status == 0" @click="createTask(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
           <a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
             <a><a-button type="danger">取消配盘</a-button> <a-divider type="vertical"/></a>
           </a-popconfirm>
@@ -58,7 +58,7 @@ public class Port implements Serializable {
     /** 巷道 */
     @Excel(name = "巷道", width = 15)
     @ApiModelProperty(value = "巷道")
-    private Integer roadWay;
+    private String roadWay;
     /** 备用字段1 */
     @Excel(name = "备用字段1", width = 15)
     @ApiModelProperty(value = "备用字段1")
@@ -1561,7 +1561,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             String value = parameterConfigurationService.getValueByCode(QuantityConstant.SHIPMENT_WHOLE_TASK_CLEAR_INVENTORY);
             if (StringUtils.isNotEmpty(value)) {
                 int shipmentWholeRule = Integer.parseInt(value);
-                if (shipmentWholeRule == QuantityConstant.RULE_TASK_AllOW_CLEAR) {
+                if (shipmentWholeRule == QuantityConstant.RULE_TASK_AllOW_CLEAR && taskType == QuantityConstant.TASK_TYPE_WHOLESHIPMENT) {
                     taskHeaderService.completeWholeShipmentTaskClearInventory(inventoryHeader, inventoryDetailList);
                 } else {
                     if (taskType == QuantityConstant.TASK_TYPE_WHOLESHIPMENT) {
@@ -1671,9 +1671,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 InventoryDetail inventoryDetail2 = inventoryDetailList.get(j);
                 if (inventoryDetail1.getMaterialCode().equals(inventoryDetail2.getMaterialCode()) && inventoryDetail1.getBatch().equals(inventoryDetail2.getBatch())
                     && inventoryDetail1.getLot().equals(inventoryDetail2.getLot()) && inventoryDetail1.getProject().equals(inventoryDetail2.getProject())
-                    && inventoryDetail1.getSn().equals(inventoryDetail2.getSn())
                     && inventoryDetail1.getInventoryStatus().equals(inventoryDetail2.getInventoryStatus())) {
                     // 属性一样的库存，相加合并。
+                    if (StringUtils.isNotEmpty(inventoryDetail1.getSn())) {
+                        if (inventoryDetail1.getSn().equals(inventoryDetail2.getSn())) {
+                            continue;
+                        }
+                    }
                     BigDecimal totalQty = inventoryDetail1.getQty().add(inventoryDetail2.getQty());
                     inventoryDetail1.setQty(totalQty);
                     InventoryDetail inventoryDetail = new InventoryDetail();