新增结束单据按钮,出库打印带托盘号

易文鹏
1 parent 9ab6dee1
Showing 8 changed files with 195 additions and 180 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
src/main/java/com/huaheng/pc/config/material/domain/Material.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
src/main/resources/templates/shipment/shipmentHeader/report.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -424,11 +424,10 @@ public class MesReceiptController extends BaseController {
                 material.setCInvCName(cInvCName);
                 materialList.add(material);
             }
-            // materialService.saveBatch(materialList);
         } catch (SQLException throwable) {
             throwable.printStackTrace();
         }
-        logger.debug("******************************同步海王物料档案" + materialList.size() + "条数据！！！");
+        logger.debug("******************************同步海王物料" + materialList.size() + "条数据！！！");
         return materialList;
     }
  
@@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.huaheng.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
 import lombok.Data;
  
-@ApiModel(value="com.huaheng.pc.config.material.domain.Material")
+@ApiModel(value = "com.huaheng.pc.config.material.domain.Material")
 @Data
 @TableName(value = "material")
 public class Material implements Serializable {
@@ -20,7 +22,7 @@ public class Material implements Serializable {
      * ID
      */
     @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="ID")
+    @ApiModelProperty(value = "ID")
     @Excel(name = "ID")
     private Integer id;
  
@@ -28,7 +30,7 @@ public class Material implements Serializable {
      * 物料编码
      */
     @TableField(value = "code")
-    @ApiModelProperty(value="物料编码")
+    @ApiModelProperty(value = "物料编码")
     @Excel(name = "物料编码")
     private String code;
  
@@ -36,7 +38,7 @@ public class Material implements Serializable {
      * 货主编码
      */
     @TableField(value = "companyCode")
-    @ApiModelProperty(value="货主编码")
+    @ApiModelProperty(value = "货主编码")
     @Excel(name = "货主编码")
     private String companyCode;
  
@@ -44,7 +46,7 @@ public class Material implements Serializable {
      * 仓库编码
      */
     @TableField(value = "warehouseCode")
-    @ApiModelProperty(value="仓库编码")
+    @ApiModelProperty(value = "仓库编码")
     @Excel(name = "仓库编码")
     private String warehouseCode;
  
@@ -52,7 +54,7 @@ public class Material implements Serializable {
      * 名称
      */
     @TableField(value = "name")
-    @ApiModelProperty(value="名称")
+    @ApiModelProperty(value = "名称")
     @Excel(name = "名称")
     private String name;
  
@@ -60,7 +62,7 @@ public class Material implements Serializable {
      * 规格
      */
     @TableField(value = "spec")
-    @ApiModelProperty(value="规格")
+    @ApiModelProperty(value = "规格")
     @Excel(name = "规格")
     private String spec;
  
@@ -68,7 +70,7 @@ public class Material implements Serializable {
      * 单位
      */
     @TableField(value = "unit")
-    @ApiModelProperty(value="单位")
+    @ApiModelProperty(value = "单位")
     @Excel(name = "单位")
     private String unit;
  
@@ -76,7 +78,7 @@ public class Material implements Serializable {
      * 类别
      */
     @TableField(value = "type")
-    @ApiModelProperty(value="类别")
+    @ApiModelProperty(value = "类别")
     @Excel(name = "类别")
     private String type;
  
@@ -84,7 +86,7 @@ public class Material implements Serializable {
      * ABC分类
      */
     @TableField(value = "abcClass")
-    @ApiModelProperty(value="ABC分类")
+    @ApiModelProperty(value = "ABC分类")
     @Excel(name = "ABC分类")
     private String abcClass;
  
@@ -92,7 +94,7 @@ public class Material implements Serializable {
      * 保质期（天）
      */
     @TableField(value = "daysToExpire")
-    @ApiModelProperty(value="保质期（天）")
+    @ApiModelProperty(value = "保质期（天）")
     @Excel(name = "保质期（天）")
     private Integer daysToExpire;
  
@@ -100,7 +102,7 @@ public class Material implements Serializable {
      * 定位规则
      */
     @TableField(value = "locatingRule")
-    @ApiModelProperty(value="定位规则")
+    @ApiModelProperty(value = "定位规则")
     @Excel(name = "定位规则")
     private String locatingRule;
  
@@ -108,7 +110,7 @@ public class Material implements Serializable {
      * 分配规则
      */
     @TableField(value = "allocationRule")
-    @ApiModelProperty(value="分配规则")
+    @ApiModelProperty(value = "分配规则")
     @Excel(name = "分配规则")
     private String allocationRule;
  
@@ -116,7 +118,7 @@ public class Material implements Serializable {
      * 补货规则
      */
     @TableField(value = "replenishmentRule")
-    @ApiModelProperty(value="补货规则")
+    @ApiModelProperty(value = "补货规则")
     @Excel(name = "补货规则")
     private String replenishmentRule;
  
@@ -124,7 +126,7 @@ public class Material implements Serializable {
      * 空货位规则
      */
     @TableField(value = "emptyLocRule")
-    @ApiModelProperty(value="空货位规则")
+    @ApiModelProperty(value = "空货位规则")
     @Excel(name = "空货位规则")
     private String emptyLocRule;
  
@@ -132,7 +134,7 @@ public class Material implements Serializable {
      * 入库流程
      */
     @TableField(value = "receivingFlow")
-    @ApiModelProperty(value="入库流程")
+    @ApiModelProperty(value = "入库流程")
     @Excel(name = "入库流程")
     private String receivingFlow;
  
@@ -140,7 +142,7 @@ public class Material implements Serializable {
      * 出库流程
      */
     @TableField(value = "shippingFlow")
-    @ApiModelProperty(value="出库流程")
+    @ApiModelProperty(value = "出库流程")
     @Excel(name = "出库流程")
     private String shippingFlow;
  
@@ -148,7 +150,7 @@ public class Material implements Serializable {
      * 属性模版
      */
     @TableField(value = "attributeTemplateCode")
-    @ApiModelProperty(value="属性模版")
+    @ApiModelProperty(value = "属性模版")
     @Excel(name = "属性模版")
     private String attributeTemplateCode;
  
@@ -156,7 +158,7 @@ public class Material implements Serializable {
      * 记录序列号
      */
     @TableField(value = "trackSerialNum")
-    @ApiModelProperty(value="记录序列号")
+    @ApiModelProperty(value = "记录序列号")
     @Excel(name = "记录序列号")
     private Integer trackSerialNum;
  
@@ -164,7 +166,7 @@ public class Material implements Serializable {
      * 自动生成序列号
      */
     @TableField(value = "autoGenSerialNum")
-    @ApiModelProperty(value="自动生成序列号")
+    @ApiModelProperty(value = "自动生成序列号")
     @Excel(name = "自动生成序列号")
     private Integer autoGenSerialNum;
  
@@ -172,7 +174,7 @@ public class Material implements Serializable {
      * 自动生成序列号表达式
      */
     @TableField(value = "autoGenSerialNumFormat")
-    @ApiModelProperty(value="自动生成序列号表达式")
+    @ApiModelProperty(value = "自动生成序列号表达式")
     @Excel(name = "自动生成序列号表达式")
     private String autoGenSerialNumFormat;
  
@@ -180,7 +182,7 @@ public class Material implements Serializable {
      * 序列号模版
      */
     @TableField(value = "snTemplateCode")
-    @ApiModelProperty(value="序列号模版")
+    @ApiModelProperty(value = "序列号模版")
     @Excel(name = "序列号模版")
     private String snTemplateCode;
  
@@ -188,7 +190,7 @@ public class Material implements Serializable {
      * 临期预警天数
      */
     @TableField(value = "expiringDays")
-    @ApiModelProperty(value="临期预警天数")
+    @ApiModelProperty(value = "临期预警天数")
     @Excel(name = "临期预警天数")
     private Integer expiringDays;
  
@@ -196,7 +198,7 @@ public class Material implements Serializable {
      * 收货预警天数
      */
     @TableField(value = "minShelfLifeDays")
-    @ApiModelProperty(value="收货预警天数")
+    @ApiModelProperty(value = "收货预警天数")
     @Excel(name = "收货预警天数")
     private Integer minShelfLifeDays;
  
@@ -204,21 +206,21 @@ public class Material implements Serializable {
      * 状态
      */
     @TableField(value = "enable")
-    @ApiModelProperty(value="状态")
+    @ApiModelProperty(value = "状态")
     private Boolean enable;
  
     /**
      * 创建时间
      */
     @TableField(value = "created")
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date created;
  
     /**
      * 创建用户
      */
     @TableField(value = "createdBy")
-    @ApiModelProperty(value="创建用户")
+    @ApiModelProperty(value = "创建用户")
  
     private String createdBy;
  
@@ -226,21 +228,21 @@ public class Material implements Serializable {
      * 创建时间
      */
     @TableField(value = "lastUpdated")
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date lastUpdated;
  
     /**
      * 更新用户
      */
     @TableField(value = "lastUpdatedBy")
-    @ApiModelProperty(value="更新用户")
+    @ApiModelProperty(value = "更新用户")
     private String lastUpdatedBy;
  
     /**
      * 数据版本
      */
     @TableField(value = "version")
-    @ApiModelProperty(value="数据版本")
+    @ApiModelProperty(value = "数据版本")
     @Excel(name = "数据版本")
     private Integer version;
  
@@ -248,7 +250,7 @@ public class Material implements Serializable {
      * 是否AGV区域发货
      */
     @TableField(value = "userDef1")
-    @ApiModelProperty(value="是否AGV区域发货")
+    @ApiModelProperty(value = "是否AGV区域发货")
     @Excel(name = "是否AGV区域发货")
     private String userDef1;
  
@@ -256,64 +258,70 @@ public class Material implements Serializable {
      * 自定义字段2
      */
     @TableField(value = "userDef2")
-    @ApiModelProperty(value="自定义字段2")
+    @ApiModelProperty(value = "自定义字段2")
     private String userDef2;
  
     /**
      * 商品同步标识
      */
     @TableField(value = "userDef3")
-    @ApiModelProperty(value="商品同步标识")
+    @ApiModelProperty(value = "商品同步标识")
     private String userDef3;
  
     /**
      * 自定义字段4
      */
     @TableField(value = "userDef4")
-    @ApiModelProperty(value="自定义字段4")
+    @ApiModelProperty(value = "自定义字段4")
     private String userDef4;
  
     /**
      * 自定义字段5
      */
     @TableField(value = "userDef5")
-    @ApiModelProperty(value="自定义字段5")
+    @ApiModelProperty(value = "自定义字段5")
     private String userDef5;
  
     /**
      * 自定义字段6
      */
     @TableField(value = "userDef6")
-    @ApiModelProperty(value="自定义字段6")
+    @ApiModelProperty(value = "自定义字段6")
     private String userDef6;
  
     /**
      * 自定义字段7
      */
     @TableField(value = "userDef7")
-    @ApiModelProperty(value="自定义字段7")
+    @ApiModelProperty(value = "自定义字段7")
     private String userDef7;
  
     /**
      * 自定义字段8
      */
     @TableField(value = "userDef8")
-    @ApiModelProperty(value="自定义字段8")
+    @ApiModelProperty(value = "自定义字段8")
     private String userDef8;
  
-    /** 删除标记*/
+    /**
+     * 删除标记
+     */
     @TableField(value = "deleted")
     @ApiModelProperty(value = "删除标记")
     private Boolean deleted;
  
-    /** */
+    /**
+     *
+     */
     @TableField(value = "isMix")
     @ApiModelProperty(value = "是否允许混放")
     private Boolean isMix;
     /** 打印机名称 */
     //    private static final  String printName = "Gprinter GP-1424D";
  
-    /** */
+    /**
+     *
+     */
     @TableField(value = "isHigh")
     @ApiModelProperty(value = "是否高托")
     private Integer isHigh;
@@ -372,4 +380,22 @@ public class Material implements Serializable {
     @TableField(value = "cInvCName")
     private String cInvCName;
  
+    @Override
+    public String toString() {
+        return "Material{" +
+                "物料编码='" + code + '\'' +
+                ", 物料名称='" + name + '\'' +
+                ", 物料规格='" + spec + '\'' +
+                ", 物料单位='" + unit + '\'' +
+                ", 是否高托=" + isHigh +
+                ", 外形尺寸='" + physicalDimension + '\'' +
+                ", u8仓库='" + defWareHouse + '\'' +
+                ", 单位编码='" + unitCode + '\'' +
+                ", 修改时间=" + modifyDate +
+                ", 启动时间=" + startDate +
+                ", 重量='" + weight + '\'' +
+                ", 存货类别编码='" + cinvccode + '\'' +
+                ", 存货类别名称='" + cInvCName + '\'' +
+                '}';
+    }
 }
@@ -3,6 +3,7 @@ package com.huaheng.pc.monitor.job.task;
  
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huaheng.api.mes.controller.MesReceiptController;
 import com.huaheng.api.mes.result.ReturnInfo;
@@ -16,6 +17,7 @@ import com.huaheng.pc.config.container.service.ContainerService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.mapper.MaterialMapper;
 import com.huaheng.pc.config.material.service.MaterialService;
 import com.huaheng.pc.config.station.domain.Station;
 import com.huaheng.pc.config.station.service.StationService;
@@ -69,6 +71,8 @@ import java.util.stream.Collectors;
 public class RyTask extends BaseController {
  
     @Resource
+    private MaterialMapper materialMapper;
+    @Resource
     private IJobLogService jobLogService;
     @Resource
     private IOperLogService operLogService;
@@ -320,76 +324,6 @@ public class RyTask extends BaseController {
         }
     }
  
-    //public void clearContainerHeader(String params) {
-    //    LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-    //    receiptContainerHeaderLambdaQueryWrapper.eq(ReceiptContainerHeader::getStatus,
-    //            QuantityConstant.RECEIPT_CONTAINER_BUILD);
-    //    List<ReceiptContainerHeader> receiptContainerHeaderList =
-    //            receiptContainerHeaderService.list(receiptContainerHeaderLambdaQueryWrapper);
-    //    for(ReceiptContainerHeader receiptContainerHeader : receiptContainerHeaderList) {
-    //        Date date = receiptContainerHeader.getCreated();
-    //        Date now = new Date();
-    //        int fore = date.getDay();
-    //        int day = now.getDay();
-    //        if(fore != day) {
-    //            receiptContainerHeaderService.removeById(receiptContainerHeader);
-    //        }
-    //    }
-    //
-    //    LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaQueryWrapper1 = Wrappers.lambdaQuery();
-    //    receiptContainerHeaderLambdaQueryWrapper1.eq(ReceiptContainerHeader::getStatus,
-    //            QuantityConstant.RECEIPT_CONTAINER_TASK);
-    //    List<ReceiptContainerHeader> receiptContainerHeaderList1 =
-    //            receiptContainerHeaderService.list(receiptContainerHeaderLambdaQueryWrapper1);
-    //    for(ReceiptContainerHeader receiptContainerHeader : receiptContainerHeaderList1) {
-    //        String containerCode = receiptContainerHeader.getContainerCode();
-    //        LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-    //        taskHeaderLambdaQueryWrapper.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
-    //                .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT,
-    //                        QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)
-    //                .eq(TaskHeader::getContainerCode, containerCode);
-    //        List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
-    //        if(taskHeaderList.size() == 0) {
-    //            receiptContainerHeader.setStatus(QuantityConstant.RECEIPT_CONTAINER_FINISHED);
-    //            receiptContainerHeaderService.updateById(receiptContainerHeader);
-    //        }
-    //    }
-    //
-    //    LambdaQueryWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-    //    shipmentContainerHeaderLambdaQueryWrapper.eq(ShipmentContainerHeader::getStatus,
-    //            QuantityConstant.SHIPMENT_CONTAINER_BUILD);
-    //    List<ShipmentContainerHeader> shipmentContainerHeaderList =
-    //            shipmentContainerHeaderService.list(shipmentContainerHeaderLambdaQueryWrapper);
-    //    for(ShipmentContainerHeader shipmentContainerHeader : shipmentContainerHeaderList) {
-    //        Date date = shipmentContainerHeader.getCreated();
-    //        Date now = new Date();
-    //        int fore = date.getDay();
-    //        int day = now.getDay();
-    //        if(fore != day) {
-    //            shipmentContainerHeaderService.removeById(shipmentContainerHeader);
-    //        }
-    //    }
-    //
-    //    LambdaQueryWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaQueryWrapper1 = Wrappers.lambdaQuery();
-    //    shipmentContainerHeaderLambdaQueryWrapper1.eq(ShipmentContainerHeader::getStatus,
-    //            QuantityConstant.SHIPMENT_CONTAINER_TASK);
-    //    List<ShipmentContainerHeader> shipmentContainerHeaderList1 =
-    //            shipmentContainerHeaderService.list(shipmentContainerHeaderLambdaQueryWrapper1);
-    //    for(ShipmentContainerHeader shipmentContainerHeader : shipmentContainerHeaderList1) {
-    //        String containerCode = shipmentContainerHeader.getContainerCode();
-    //        LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-    //        taskHeaderLambdaQueryWrapper.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
-    //                .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLESHIPMENT,
-    //                        QuantityConstant.TASK_TYPE_SORTINGSHIPMENT)
-    //                .eq(TaskHeader::getContainerCode, containerCode);
-    //        List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
-    //        if(taskHeaderList.size() == 0) {
-    //            shipmentContainerHeader.setStatus(QuantityConstant.SHIPMENT_CONTAINER_FINISHED);
-    //            shipmentContainerHeaderService.updateById(shipmentContainerHeader);
-    //        }
-    //    }
-    //}
-
  
     /**
      * 同步物料接口
@@ -398,64 +332,45 @@ public class RyTask extends BaseController {
         MesReceiptController MesReceiptController = new MesReceiptController();
         List<Material> materialList = MesReceiptController.getMaterial();
         List<Material> saveMaterials = new ArrayList<>();
-        List<Material> updateMaterials = new ArrayList<>();
-
         if (materialList != null && materialList.size() > 0) {
             for (Material material : materialList) {
                 Material one = materialService.getOne(new LambdaQueryWrapper<Material>().eq(Material::getCode, material.getCode()));
                 if (one == null) {
-                    ApiLog apiLog = new ApiLog();
-                    apiLog.setApiName("同步物料");
-                    apiLog.setRequestBody(material.toString());
-                    apiLog.setRequestTime(new Date());
-                    apiLog.setRequestFrom("WMS");
-                    apiLog.setResponseBy("U8");
-                    apiLog.setResponseBody("同步物料成功");
-                    apiLogService.save(apiLog);
                     saveMaterials.add(material);
+                    addApiLog("新增物料", material.toString());
                 } else {
-                    updateMaterials.add(material);
-                    ApiLog apiLog = new ApiLog();
-                    apiLog.setApiName("更新物料");
-                    apiLog.setRequestBody(material.toString());
-                    apiLog.setRequestTime(new Date());
-                    apiLog.setRequestFrom("WMS");
-                    apiLog.setResponseBy("U8");
-                    apiLog.setResponseBody("更新物料成功");
-                    apiLogService.save(apiLog);
+                    LambdaUpdateWrapper<Material> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.eq(Material::getCode, material.getCode());
+                    Material newMaterial = new Material();
+                    newMaterial.setName(material.getName());
+                    newMaterial.setSpec(material.getSpec());
+                    newMaterial.setUnit(material.getUnit());
+                    newMaterial.setCode(material.getCode());
+                    newMaterial.setLastUpdated(material.getLastUpdated());
+                    newMaterial.setLastUpdatedBy(material.getLastUpdatedBy());
+                    materialMapper.update(newMaterial, updateWrapper);
+                    addApiLog("更新物料", material.toString());
                 }
             }
             if (saveMaterials.size() > 0) {
                 materialService.saveBatch(saveMaterials);
             }
-            if (updateMaterials.size() > 0) {
-                materialService.updateBatchById(updateMaterials);
-            }
-        }
-    }
  
-    /**
-     * 开启plc
-     *
-     * @param params
-     */
-    public void autoCheckPlcConnectTask(String params) {
-        System.out.println("0000000000000000000000000");
-        LambdaQueryWrapper<PlcEquipment> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(PlcEquipment::getStatus, 1);
-        List<PlcEquipment> list = equipmentService.list(wrapper);
-        for (int a = 0; a < list.size(); a++) {
-            PlcEquipment plcEquipment = list.get(a);
-            String addressIp = plcEquipment.getEquipmentIp();
-            int port = plcEquipment.getPort();
-            //SiemensS7NetV siemensS7NetV= PlcConnectUtil.start(addressIp,a+1);
-            if (!PlcConnectUtil.checkConnect(a + 1)) {
-                PlcConnectUtil.start(addressIp, a + 1, port);
-            }
         }
     }
  
  
+    public void addApiLog(String name, String requestBody) {
+        ApiLog apiLog = new ApiLog();
+        apiLog.setApiName(name);
+        apiLog.setRequestBody(requestBody);
+        apiLog.setRequestTime(new Date());
+        apiLog.setRequestFrom("MOM");
+        apiLog.setResponseBy("WMS");
+        apiLog.setResponseBody("成功");
+        apiLogService.save(apiLog);
+    }
+
     //回传单据的记录历史单据
     public void gcBill() {
         LambdaQueryWrapper<ReceiptHeader> query = Wrappers.lambdaQuery();
@@ -268,7 +268,7 @@ public class ReceiptHeaderController extends BaseController {
             if (receiptHeader == null) {
                 return AjaxResult.error("没有找到单据" + String.valueOf(id));
             }
-            if(receiptHeader.getFirstStatus() >= QuantityConstant.RECEIPT_HEADER_POOL) {
+            if (receiptHeader.getFirstStatus() >= QuantityConstant.RECEIPT_HEADER_POOL) {
                 return AjaxResult.error("订单状态大于100不能删除");
             }
             List<ReceiptDetail> list = receiptDetailService.list(new LambdaQueryWrapper<ReceiptDetail>().eq(ReceiptDetail::getReceiptId, id));
@@ -444,4 +444,28 @@ public class ReceiptHeaderController extends BaseController {
         receiptHeaderService.updateById(receiptHeader);
         return AjaxResult.success("回传成功");
     }
+
+    /**
+     * 无需回传
+     */
+    @PostMapping("/noReturnRequired")
+    @ResponseBody
+    public AjaxResult noReturnRequired(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return AjaxResult.error("id不能为空");
+        }
+        ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
+        if (receiptHeader == null) {
+            return AjaxResult.error("没有找到入库单");
+        }
+        if (receiptHeader.getPushSuccessStatus() != 2) {
+            return AjaxResult.error("只有回传错误，才能结束回传！");
+        }
+        receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+        receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+        receiptHeader.setPushSuccessStatus(1);
+        receiptHeader.setErrorMsg("");
+        receiptHeaderService.updateById(receiptHeader);
+        return AjaxResult.success("修改单据成功");
+    }
 }
@@ -418,9 +418,11 @@ public class ShipmentHeaderController extends BaseController {
  
             List<ShipmentContainerDetail> list = shipmentContainerDetailService.list(new LambdaQueryWrapper<ShipmentContainerDetail>()
                     .eq(ShipmentContainerDetail::getShipmentDetailId, item.getId()));
-            if (!list.isEmpty()) {
-                item.setContainerCode(list.get(0).getContainerCode());
-            }
+
+            list.stream()
+                    .findFirst()
+                    .ifPresent(shipmentContainerDetail -> item.setContainerCode(shipmentContainerDetail.getContainerCode()));
+
             item.setInventoryQty(inventoryDetailService.getSumQty(inventory));
             if (item.getQty().compareTo(item.getTaskQty()) != 0) {
                 if (item.getInventoryQty().compareTo(new BigDecimal(0)) == 0) {
@@ -641,5 +643,29 @@ public class ShipmentHeaderController extends BaseController {
         return AjaxResult.error("回传失败");
     }
  
+    /**
+     * 无需回传
+     */
+    @PostMapping("/noReturnRequired")
+    @ResponseBody
+    public AjaxResult noReturnRequired(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return AjaxResult.error("id不能为空");
+        }
+        ShipmentHeader shipmentHeader = shipmentHeaderService.getById(id);
+        if (shipmentHeader == null) {
+            return AjaxResult.error("没有找到入库单");
+        }
+        if (shipmentHeader.getPushSuccessStatus() != 2) {
+            return AjaxResult.error("只有回传错误，才能结束回传！");
+        }
+        shipmentHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+        shipmentHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+        shipmentHeader.setPushSuccessStatus(1);
+        shipmentHeader.setErrorMsg("");
+        shipmentHeaderService.updateById(shipmentHeader);
+        return AjaxResult.success("修改单据成功");
+    }
+
  
 }
@@ -113,10 +113,10 @@
                         </form>
                     </div>
                     <div class="btn-group hidden-xs" id="toolbar" role="group">
-<!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"-->
-<!--                           shiro:hasPermission="receipt:receiptHeader:add">-->
-<!--                            <i class="fa fa-plus"></i> 新增-->
-<!--                        </a>-->
+                        <!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"-->
+                        <!--                           shiro:hasPermission="receipt:receiptHeader:add">-->
+                        <!--                            <i class="fa fa-plus"></i> 新增-->
+                        <!--                        </a>-->
                         <!--                        <a class="btn btn-outline btn-default btn-rounded" onclick="submitReview()" shiro:hasPermission="receipt:receiptHeader:approval">-->
                         <!--                            <i class="fa fa-fighter-jet"></i> 提交审核-->
                         <!--                        </a>-->
@@ -126,14 +126,14 @@
                         <!--                        <a class="btn btn-outline btn-primary btn-rounded" onclick="addPool()" shiro:hasPermission="receipt:receiptHeader:addPool">-->
                         <!--                            <i class="fa fa-check-circle"></i> 加入订单池-->
                         <!--                        </a>-->
-<!--                        <a class="btn btn-outline btn-info btn-rounded" onclick="crossLocation()"-->
-<!--                           shiro:hasPermission="receipt:receiptHeader:cross">-->
-<!--                            <i class="fa fa-random"></i> 越库-->
-<!--                        </a>-->
-<!--                        <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"-->
-<!--                           shiro:hasPermission="receipt:receiptHeader:remove">-->
-<!--                            <i class="fa fa-trash-o"></i> 删除-->
-<!--                        </a>-->
+                        <!--                        <a class="btn btn-outline btn-info btn-rounded" onclick="crossLocation()"-->
+                        <!--                           shiro:hasPermission="receipt:receiptHeader:cross">-->
+                        <!--                            <i class="fa fa-random"></i> 越库-->
+                        <!--                        </a>-->
+                        <!--                        <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"-->
+                        <!--                           shiro:hasPermission="receipt:receiptHeader:remove">-->
+                        <!--                            <i class="fa fa-trash-o"></i> 删除-->
+                        <!--                        </a>-->
                     </div>
                     <table id="bootstrap-table" data-th-height="50" data-mobile-responsive="true"
                            class="table table-bordered table-hover text-nowrap"></table>
@@ -240,14 +240,14 @@
                         </form>
                     </div>
                     <div class="btn-group hidden-xs" id="toolbar1" role="group" style="position:relative;">
-<!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="add()"-->
-<!--                           shiro:hasPermission="receipt:receiptDetail:add">-->
-<!--                            <i class="fa fa-plus"></i> 新增-->
-<!--                        </a>-->
-<!--                        <a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()"-->
-<!--                           shiro:hasPermission="receipt:receiptDetail:remove">-->
-<!--                            <i class="fa fa-trash-o"></i> 删除-->
-<!--                        </a>-->
+                        <!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="add()"-->
+                        <!--                           shiro:hasPermission="receipt:receiptDetail:add">-->
+                        <!--                            <i class="fa fa-plus"></i> 新增-->
+                        <!--                        </a>-->
+                        <!--                        <a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()"-->
+                        <!--                           shiro:hasPermission="receipt:receiptDetail:remove">-->
+                        <!--                            <i class="fa fa-trash-o"></i> 删除-->
+                        <!--                        </a>-->
                         <a class="btn btn-outline btn-success btn-rounded" onclick="receiptDetailPrint()"
                            shiro:hasPermission="shipment:bill:report">
                             <i class="fa fa-print"></i> 打印
@@ -265,6 +265,7 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
+    var noReturnRequiredFlag = [[${@permission.hasPermi('receipt:receiptHeader:noReturnRequired')}]];
     var printFlag = [[${@permission.hasPermi('receipt:receiptHeader:report')}]];
     var editFlag = [[${@permission.hasPermi('receipt:receiptHeader:edit')}]];
     var removeFlag = [[${@permission.hasPermi('receipt:receiptHeader:remove')}]];
@@ -335,6 +336,9 @@
                         if (row.firstStatus < 100) {
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
                         }
+                        if (row.pushSuccessStatus === 2) {
+                            actions.push('<a class="btn btn-danger btn-xs ' + noReturnRequiredFlag + '" href="#" onclick="noReturnRequired(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>无需回传</a>');
+                        }
                         return actions.join('');
                     }
                 },
@@ -982,6 +986,13 @@
         $.modal.open("预约到货" + $.table._option.modalName, url);
     }
  
+    /* 无需回传 */
+    function noReturnRequired(id) {
+        var url = prefix + "/noReturnRequired";
+        var data = {"id": id};
+        $.operate.submit(url, "post", "json", data);
+    }
+
     function check(id) {
         var url = prefix + "/check";
         var data = {"id": id};
@@ -30,7 +30,7 @@
                     <div style="width:45%; float:left;">母件名称：<span
                             th:text="${shipmentHeader['superiorName']}"></span></div>
                     <span></span>
-                    
+
                     <div style="width:45%; float:left;">调入仓库名称：<span
                             th:text="${shipmentHeader['transferWarehouseName']}"></span>
                     </div>
@@ -52,6 +52,7 @@
                 </td>
             </tr>
             <tr>
+                <th width="18%">托盘号</th>
                 <th width="18%">物料编码</th>
                 <th width="22%">物料名称</th>
                 <!--                <th width="10%">物料规格</th>
@@ -65,6 +66,7 @@
             </thead>
             <tbody>
             <tr th:each="row,rowStat : ${details}">
+                <td th:text="${row.containerCode}"></td>
                 <td th:text="${row.materialCode}"></td>
                 <td th:text="${row.materialName}"></td>
                 <!--<td th:text="${row.materialSpec}"></td>
@@ -293,6 +293,7 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
+    var noReturnRequiredFlag = [[${@permission.hasPermi('shipment:shipmentHeader:noReturnRequired')}]];
     var printFlag = [[${@permission.hasPermi('shipment:bill:report')}]]; //打印
     var editFlag = [[${@permission.hasPermi('shipment:bill:edit')}]];
     var removeFlag = [[${@permission.hasPermi('shipment:remove')}]];
@@ -381,6 +382,9 @@
                         if (row.firstStatus == 500 && row.lastStatus == 500) {
                             actions.push('<a class="btn btn-info btn-xs ' + '" href="#" onclick="backERP(\'' + row.id + '\')"><i class="fa fa-upload"></i>回传</a>');
                         }
+                        if (row.pushSuccessStatus === 2) {
+                            actions.push('<a class="btn btn-danger btn-xs ' + noReturnRequiredFlag + '" href="#" onclick="noReturnRequired(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>无需回传</a>');
+                        }
                         return actions.join('');
                     }
                 },
@@ -1025,6 +1029,14 @@
         $.ajax(config)
     }
  
+    /* 无需回传 */
+    function noReturnRequired(id) {
+        var url = prefix + "/noReturnRequired";
+        var data = {"id": id};
+        $.operate.submit(url, "post", "json", data);
+    }
+
+
     /* 出库组盘 */
     function Toshipping(flag) {
         let storage = window.localStorage;