fix: 出库打印明细改为25行

易文鹏
1 parent b3f0a8e6
Showing 4 changed files with 7 additions and 14 deletions
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/resources/application.yml
@@ -33,7 +33,6 @@ import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.shipment.shipmentHeaderHistory.service.ShipmentHeaderHistoryService;
 import com.huaheng.pc.system.config.service.IConfigService;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
-import com.sun.xml.internal.bind.v2.model.annotation.Quick;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
@@ -192,7 +191,7 @@ public class MesServiceImpl implements IMesService {
         }
  
         //快速入库，组盘，完成任务，无需回传MOM
-        if (receiptHeader.getIsFastReceipt() == 1) {
+        if (receiptHeader.getIsFastReceipt() != null && receiptHeader.getIsFastReceipt() == 1) {
             if (!quickStorage(receiptHeader, receiptHeader.getFastReceiptWarehouse())) {
                 throw new ServiceException("快速入库失败");
             }
@@ -597,7 +597,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
  
     public AjaxResult executeReport(ShipmentHeader shipmentHeader, List<TaskDetail> taskDetails, String unionCode, String zoneInfo, int currentPageEndIndex) {
         //分页打印
-        int pageSize = 30;
+        int pageSize = 25;
         int pageCount = (int) Math.ceil((double) taskDetails.size() / pageSize);
         currentPageEndIndex = currentPageEndIndex + pageCount - 1;
         for (int page = 1; page <= pageCount; page++) {
@@ -244,7 +244,6 @@ public class TaskHeaderController extends BaseController {
         return receiptTaskService.backMomReceipt(taskHeader);
     }
  
-
     /**
      * 删除立库任务
      */
@@ -259,12 +258,8 @@ public class TaskHeaderController extends BaseController {
         Integer[] idList = Convert.toIntArray(ids);
         for (int id : idList) {
             TaskHeader taskHeader = taskHeaderService.getById(id);
-            if (taskHeader == null) {
-                return AjaxResult.error("WMS找不到该任务:" + id);
-            }
-            //没有下发wcs就直接在wms上取消
             if (taskHeader.getStatus() <= QuantityConstant.TASK_STATUS_BUILD) {
-                return taskHeaderService.cancelTask(Convert.toIntArray(ids));
+                continue;
             }
             String containerCode = taskHeader.getContainerCode();
             if (StringUtils.isEmpty(containerCode)) {
@@ -273,13 +268,11 @@ public class TaskHeaderController extends BaseController {
             Container container = containerService.getContainerByCode(containerCode, taskHeader.getWarehouseCode());
             ContainerType containerType = containerTypeService.getContainerTypeByCode(container.getContainerType(), container.getWarehouseCode());
             AjaxResult ajaxResult = taskCancelService.cancelTask(String.valueOf(id), taskHeader.getWarehouseCode(), containerType.getArea());
-            if (ajaxResult.getCode() == 200) {
-                return taskHeaderService.cancelTask(Convert.toIntArray(ids));
-            } else {
+            if (ajaxResult.getCode() != 200) {
                 throw new ServiceException("WCS取消任务失败：" + ajaxResult.getMsg());
             }
         }
-        return AjaxResult.success();
+        return taskHeaderService.cancelTask(Convert.toIntArray(ids));
     }
  
     /**
@@ -109,7 +109,8 @@ spring:
   # redis 配置
   redis:
     # 地址
-    #    host: 192.168.100.134
+    # host: 192.168.100.134
+    # host: 192.168.100.136
     host: localhost
     # 端口，默认为6379
     port: 6379