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

谭毅彬
2 parents b3ece8e4 75336c9a
Showing 6 changed files with 43 additions and 22 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/ErpTask.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentHeader.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -175,7 +175,7 @@
         </template>
         <span slot="action" slot-scope="text, record">
-          <a-popconfirm v-has="'receiptHeader:back'" v-show="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
+          <a-popconfirm v-has="'receiptHeader:back'" v-show="record.lastStatus == 800 && record.referCode != null" title="确定回传吗?" @confirm="() => hanleBack(record)">
           	<a><a-button type="default">回传</a-button></a>
           </a-popconfirm>
           <a-popconfirm v-has="'receiptHeader:crossDocking'" v-show="record.lastStatus == 0" title="确定越库吗?" @confirm="() => hanleCross(record)">
@@ -329,6 +329,11 @@ export default {
           dataIndex: 'remark'
         },
         {
+          title: '回传失败原因',
+          align: "center",
+          dataIndex: 'backErrorMsg'
+        },
+        {
           title: '创建人',
           align: "center",
           dataIndex: 'createBy'
@@ -204,7 +204,7 @@
         <span slot="action" slot-scope="text, record">
           <a v-if="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
           <a v-if="record.nextAuditor == username && flowOff == '1' " @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
-          <a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
+          <a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800 && record.referCode != null" title="确定回传吗?" @confirm="() => hanleBack(record)">
             <a><a-button type="default">回传</a-button></a>
           </a-popconfirm>
           <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800))
@@ -368,6 +368,11 @@ export default {
           dataIndex: 'remark'
         },
         {
+          title: '回传失败原因',
+          align: "center",
+          dataIndex: 'backErrorMsg'
+        },
+        {
           title: '创建人',
           align: "center",
           dataIndex: 'createBy'
@@ -436,20 +436,22 @@ public class ErpServiceImpl implements IErpService {
             throw new JeecgBootException("接口地址错误或返回为空");
         }
         Result result = JSON.parseObject(body, Result.class);
+        ReceiptHeader receiptHeader1 = new ReceiptHeader();
+        receiptHeader1.setId(receiptHeader.getId());
         if (result.getCode() != QuantityConstant.HTTP_OK) {
-            receiptHeader.setBackErrorMsg(result.getMessage());
-            receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN_ERROR);
-            receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN_ERROR);
-            receiptHeaderService.updateById(receiptHeader);
+            receiptHeader1.setBackErrorMsg(result.getMessage());
+            receiptHeader1.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN_ERROR);
+            receiptHeader1.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN_ERROR);
+            receiptHeaderService.updateById(receiptHeader1);
             return Result.error(result.getMessage());
         }
-        receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
-        receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
-        boolean success = receiptHeaderService.updateById(receiptHeader);
+        receiptHeader1.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+        receiptHeader1.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+        boolean success = receiptHeaderService.updateById(receiptHeader1);
         if (!success) {
             throw new JeecgBootException("回传入库单失败, 更新入库单头失败");
         }
-        if (!receiptHeaderService.delMain(receiptHeader.getId().toString(), QuantityConstant.BACK_DELETE_RECEIPT)) {
+        if (!receiptHeaderService.delMain(receiptHeader1.getId().toString(), QuantityConstant.BACK_DELETE_RECEIPT)) {
             throw new JeecgBootException("回传入库单失败, 放进入库历史表单失败");
         }
         return Result.ok("回传入库单成功");
@@ -476,16 +478,22 @@ public class ErpServiceImpl implements IErpService {
             throw new JeecgBootException("接口地址错误或返回为空");
         }
         Result result = JSON.parseObject(body, Result.class);
+        ShipmentHeader shipmentHeader1 = new ShipmentHeader();
+        shipmentHeader1.setId(shipmentHeader.getId());
         if (result.getCode() != QuantityConstant.HTTP_OK) {
+            shipmentHeader1.setBackErrorMsg(result.getMessage());
+            shipmentHeader1.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN_ERROR);
+            shipmentHeader1.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN_ERROR);
+            shipmentHeaderService.updateById(shipmentHeader1);
             return Result.error(result.getMessage());
         }
-        shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
-        shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
-        boolean success = shipmentHeaderService.updateById(shipmentHeader);
+        shipmentHeader1.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
+        shipmentHeader1.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
+        boolean success = shipmentHeaderService.updateById(shipmentHeader1);
         if (!success) {
             throw new JeecgBootException("回传出库单失败, 更新出库单头失败");
         }
-        if (!shipmentHeaderService.delMain(shipmentHeader.getId().toString(), QuantityConstant.BACK_DELETE_RECEIPT)) {
+        if (!shipmentHeaderService.delMain(shipmentHeader1.getId().toString(), QuantityConstant.BACK_DELETE_RECEIPT)) {
             throw new JeecgBootException("回传出库单失败, 放进出库历史表单失败");
         }
         return Result.ok("回传出库单成功");
@@ -42,8 +42,8 @@ public class ErpTask implements Job {
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
         LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-        receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getFirstStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED).eq(ReceiptHeader::getLastStatus,
-            QuantityConstant.RECEIPT_HEADER_COMPLETED);
+        receiptHeaderLambdaQueryWrapper.in(ReceiptHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED, QuantityConstant.RECEIPT_HEADER_RETURN_ERROR)
+            .isNotNull(ReceiptHeader::getReferCode);
         List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderLambdaQueryWrapper);
         for (ReceiptHeader receiptHeader : receiptHeaderList) {
             try {
@@ -52,10 +52,9 @@ public class ErpTask implements Job {
                 e.printStackTrace();
             }
         }
-
         LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-        shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getFirstStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED).eq(ShipmentHeader::getLastStatus,
-            QuantityConstant.RECEIPT_HEADER_COMPLETED);
+        shipmentHeaderLambdaQueryWrapper.in(ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED, QuantityConstant.SHIPMENT_HEADER_RETURN_ERROR)
+            .isNotNull(ShipmentHeader::getReferCode);
         List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(shipmentHeaderLambdaQueryWrapper);
         for (ShipmentHeader shipmentHeader : shipmentHeaderList) {
             try {
@@ -92,6 +92,10 @@ public class ShipmentHeader implements Serializable {
     /** 出库口 */
     @TableField(exist = false)
     private String toPort;
+    /** 回传失败原因 */
+    @Excel(name = "回传失败原因", width = 15)
+    @ApiModelProperty(value = "回传失败原因")
+    private String backErrorMsg;
     /** 备用字段1 */
     @Excel(name = "备用字段1", width = 15)
     @ApiModelProperty(value = "备用字段1")
@@ -1078,6 +1078,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 break;
         }
         taskHeaderService.cancelLocationAndContainerStatus(taskHeader);
+        if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(taskHeader.getContainerCode(), taskHeader.getWarehouseCode())) {
+            throw new JeecgBootException("取消任务失败， 更新库存明细失败");
+        }
         int toWcs = taskHeader.getToWcs();
         if (toWcs == QuantityConstant.TO_WCS) {
             if (taskHeader.getStatus().intValue() > QuantityConstant.TASK_STATUS_BUILD) {
@@ -1087,9 +1090,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 }
             }
         }
-        if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(taskHeader.getContainerCode(), taskHeader.getWarehouseCode())) {
-            throw new JeecgBootException("取消任务失败， 更新库存明细失败");
-        }
         log.info("完成取消任务" + taskHeader.getId());
         return result;
     }