表结构修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/asn/WmsDocAsnHeaderController.java

@@ -141,10 +141,10 @@ public class WmsDocAsnHeaderController extends BaseController {
             asnNo = sysIdsequenceService.getCurrent("ASNNO");
             Date now = new Date();
             docAsnHeader.setAsnNo(asnNo);
-            docAsnHeader.setCreateUserId(loginUser.getUsername());
-            docAsnHeader.setCreateDate(now);
-            docAsnHeader.setEditDate(now);
-            docAsnHeader.setEditUserId(loginUser.getUsername());
+            docAsnHeader.setCreateBy(loginUser.getUsername());
+            docAsnHeader.setCreateTime(now);
+            docAsnHeader.setUpdateTime(now);
+            docAsnHeader.setUpdateBy(loginUser.getUsername());
             docAsnHeader.setAsnType("PR");
             docAsnHeader.setAsnStatus("00");
         } else {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/order/WmsDocOrderHeaderController.java

@@ -105,7 +105,7 @@ public class WmsDocOrderHeaderController extends BaseController {
     }
 
     /**
-     * 新增入库单明细
+     * 初始化出库单
      */
     @GetMapping(value = "/initOrderHeader/{orderNo}")
     public AjaxResult initOrderHeader(@PathVariable("orderNo") String orderNo) {
@@ -119,6 +119,7 @@ public class WmsDocOrderHeaderController extends BaseController {
             orderHeader.setCreateTime(now);
             orderHeader.setOrderType("PR");
             orderHeader.setOrderStatus("00");
+            orderHeader.setCustomerId("");
         } else {
             orderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(orderNo);
             if (orderHeader == null) {
@@ -133,10 +134,8 @@ public class WmsDocOrderHeaderController extends BaseController {
     @PostMapping("/addDocOrderHeader")
     public AjaxResult addDocOrderHeader(@RequestBody WmsDocOrderHeader wmsDocOrderHeader) {
         LoginUser loginUser = getLoginUser();
-        wmsDocOrderHeader.setAddTime(new Date());
-        wmsDocOrderHeader.setAddWho(loginUser.getUsername());
-        wmsDocOrderHeader.setCreateBy(loginUser.getUsername());
         wmsDocOrderHeader.setCreateTime(new Date());
+        wmsDocOrderHeader.setCreateBy(loginUser.getUsername());
         return toAjax(wmsDocOrderHeaderService.insertWmsDocOrderHeader(wmsDocOrderHeader));
     }
 

ruoyi-admin/src/test/java/com/ruoyi/admin/test/base/WarehouseTest.java

@@ -2,6 +2,8 @@ package com.ruoyi.admin.test.base;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.RuoYiApplication;
+import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
+import com.ruoyi.ams.asn.domain.WmsDocAsnHeader;
 import com.ruoyi.ams.business.domain.FilterLockInvLocationDTO;
 import com.ruoyi.ams.config.domain.AsnSoStrategy;
 import com.ruoyi.ams.config.domain.FlowConfigHeader;
@@ -26,6 +28,7 @@ import com.ruoyi.base.mapper.BaseSkuMapper;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.service.IBaseWarehouseService;
 import com.ruoyi.base.service.SysIdsequenceService;
+import com.ruoyi.base.utils.IdSequenceUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +36,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -68,6 +72,8 @@ public class WarehouseTest {
     private AsnSoStrategyMapper asnSoStrategyMapper;
     @Autowired
     private WmsDocOrderDetailsMapper wmsDocOrderDetailsMapper;
+    @Autowired
+    private IdSequenceUtils idSequenceUtils;
 
     @Test
     public void test() {
@@ -175,4 +181,21 @@ public class WarehouseTest {
         List<StockOrderVO> orderVOList = wmsDocOrderDetailsMapper.selectStockOrder("123");
         System.out.println(orderVOList);
     }
+
+    @Test
+    public void initDocAsnData() {
+        String asnNo = idSequenceUtils.generateId("ASNNO");
+//        WmsDocAsnHeader header = new WmsDocAsnHeader();
+//        header.setAsnNo(asnNo);
+//        header.setAsnStatus("00");
+//        header.setAsnType("PR");
+//        header.setCreateDate(new Date());
+//        header.setCreateUserId();
+//        WmsDocAsnDetails details = new WmsDocAsnDetails();
+    }
+
+    @Test
+    public void initDocOrderData() {
+
+    }
 }

warewms-ams/src/main/java/com/ruoyi/ams/asn/domain/WmsDocAsnDetails.java

@@ -1,18 +1,16 @@
 package com.ruoyi.ams.asn.domain;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 入库单体对象 wms_doc_asn_details
+ * 入库单明细对象 wms_doc_asn_details
  * 
  * @author ruoyi
- * @date 2022-10-12
+ * @date 2022-11-14
  */
 public class WmsDocAsnDetails extends BaseEntity
 {
@@ -96,62 +94,46 @@ public class WmsDocAsnDetails extends BaseEntity
     @Excel(name = "供应商")
     private String lotatt08;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt09;
 
     /** 检验日期 */
     @Excel(name = "检验日期")
     private String lotatt10;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt11;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt12;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt13;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt14;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt15;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt16;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt17;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt18;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String createUserId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date createDate;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String editUserId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date editDate;
-
     /** 指定库位 */
     @Excel(name = "指定库位")
     private Long locationId;
@@ -164,60 +146,60 @@ public class WmsDocAsnDetails extends BaseEntity
     @Excel(name = "归还人")
     private String dEdi01;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi02;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi03;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi04;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi05;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi06;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi07;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi08;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi09;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi10;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi11;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi12;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi13;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi14;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi15;
 
     public void setAsnLineNo(Long asnLineNo) 
@@ -490,42 +472,6 @@ public class WmsDocAsnDetails extends BaseEntity
     {
         return lotatt18;
     }
-    public void setCreateUserId(String createUserId) 
-    {
-        this.createUserId = createUserId;
-    }
-
-    public String getCreateUserId() 
-    {
-        return createUserId;
-    }
-    public void setCreateDate(Date createDate) 
-    {
-        this.createDate = createDate;
-    }
-
-    public Date getCreateDate() 
-    {
-        return createDate;
-    }
-    public void setEditUserId(String editUserId) 
-    {
-        this.editUserId = editUserId;
-    }
-
-    public String getEditUserId() 
-    {
-        return editUserId;
-    }
-    public void setEditDate(Date editDate) 
-    {
-        this.editDate = editDate;
-    }
-
-    public Date getEditDate() 
-    {
-        return editDate;
-    }
     public void setLocationId(Long locationId) 
     {
         this.locationId = locationId;
@@ -713,10 +659,10 @@ public class WmsDocAsnDetails extends BaseEntity
             .append("lotatt16", getLotatt16())
             .append("lotatt17", getLotatt17())
             .append("lotatt18", getLotatt18())
-            .append("createUserId", getCreateUserId())
-            .append("createDate", getCreateDate())
-            .append("editUserId", getEditUserId())
-            .append("editDate", getEditDate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .append("locationId", getLocationId())
             .append("documentId", getDocumentId())
             .append("dEdi01", getdEdi01())

warewms-ams/src/main/java/com/ruoyi/ams/asn/domain/WmsDocAsnHeader.java

@@ -84,16 +84,16 @@ public class WmsDocAsnHeader extends BaseEntity
     private String userdefine5;
 
     /** $column.columnComment */
-    private String createUserId;
+    private String createBy;
 
     /** $column.columnComment */
-    private Date createDate;
+    private Date createTime;
 
     /** $column.columnComment */
-    private String editUserId;
+    private String updateBy;
 
     /** $column.columnComment */
-    private Date editDate;
+    private Date updateTime;
 
     /** 是否有效(N删除Y有效) */
     private String activeFlag;
@@ -308,43 +308,48 @@ public class WmsDocAsnHeader extends BaseEntity
     {
         return userdefine5;
     }
-    public void setCreateUserId(String createUserId) 
-    {
-        this.createUserId = createUserId;
+
+    @Override
+    public String getCreateBy() {
+        return createBy;
     }
 
-    public String getCreateUserId() 
-    {
-        return createUserId;
+    @Override
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
     }
-    public void setCreateDate(Date createDate) 
-    {
-        this.createDate = createDate;
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public Date getCreateDate() 
-    {
-        return createDate;
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
-    public void setEditUserId(String editUserId) 
-    {
-        this.editUserId = editUserId;
+
+    @Override
+    public String getUpdateBy() {
+        return updateBy;
     }
 
-    public String getEditUserId() 
-    {
-        return editUserId;
+    @Override
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
     }
-    public void setEditDate(Date editDate) 
-    {
-        this.editDate = editDate;
+
+    @Override
+    public Date getUpdateTime() {
+        return updateTime;
     }
 
-    public Date getEditDate() 
-    {
-        return editDate;
+    @Override
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
     }
-    public void setActiveFlag(String activeFlag) 
+
+    public void setActiveFlag(String activeFlag)
     {
         this.activeFlag = activeFlag;
     }
@@ -520,10 +525,6 @@ public class WmsDocAsnHeader extends BaseEntity
             .append("userdefine3", getUserdefine3())
             .append("userdefine4", getUserdefine4())
             .append("userdefine5", getUserdefine5())
-            .append("createUserId", getCreateUserId())
-            .append("createDate", getCreateDate())
-            .append("editUserId", getEditUserId())
-            .append("editDate", getEditDate())
             .append("activeFlag", getActiveFlag())
             .append("hEdi01", gethEdi01())
             .append("hEdi02", gethEdi02())

warewms-ams/src/main/java/com/ruoyi/ams/order/domain/WmsDocOrderDetails.java

@@ -1,18 +1,16 @@
 package com.ruoyi.ams.order.domain;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 出库单体对象 wms_doc_order_details
+ * 出库单对象 wms_doc_order_details
  * 
  * @author ruoyi
- * @date 2022-10-28
+ * @date 2022-11-14
  */
 public class WmsDocOrderDetails extends BaseEntity
 {
@@ -88,76 +86,76 @@ public class WmsDocOrderDetails extends BaseEntity
     @Excel(name = "单位")
     private String uom;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt01;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt02;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt03;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt04;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt05;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt06;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt07;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt08;
 
     /** 领用人 */
     @Excel(name = "领用人")
     private String lotatt09;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt10;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt11;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt12;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt13;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt14;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt15;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt16;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt17;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String lotatt18;
 
     /** 包装规格 */
@@ -176,22 +174,6 @@ public class WmsDocOrderDetails extends BaseEntity
     @Excel(name = "批次号")
     private String lotnum;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date addTime;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String addWho;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date editTime;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String editWho;
-
     /** 净重 */
     @Excel(name = "净重")
     private BigDecimal netWeight;
@@ -204,84 +186,84 @@ public class WmsDocOrderDetails extends BaseEntity
     @Excel(name = "体积")
     private BigDecimal cubic;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi01;
 
     /** 目标库位 */
     @Excel(name = "目标库位")
     private String dEdi02;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi03;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi04;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi05;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi06;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi07;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi08;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private BigDecimal dEdi09;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private BigDecimal dEdi10;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi11;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi12;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi13;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi14;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi15;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi16;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi17;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi18;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi19;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**  */
+    @Excel(name = "")
     private String dEdi20;
 
     /** 跟踪号（未启用） */
@@ -676,42 +658,6 @@ public class WmsDocOrderDetails extends BaseEntity
     {
         return lotnum;
     }
-    public void setAddTime(Date addTime) 
-    {
-        this.addTime = addTime;
-    }
-
-    public Date getAddTime() 
-    {
-        return addTime;
-    }
-    public void setAddWho(String addWho) 
-    {
-        this.addWho = addWho;
-    }
-
-    public String getAddWho() 
-    {
-        return addWho;
-    }
-    public void setEditTime(Date editTime) 
-    {
-        this.editTime = editTime;
-    }
-
-    public Date getEditTime() 
-    {
-        return editTime;
-    }
-    public void setEditWho(String editWho) 
-    {
-        this.editWho = editWho;
-    }
-
-    public String getEditWho() 
-    {
-        return editWho;
-    }
     public void setNetWeight(BigDecimal netWeight) 
     {
         this.netWeight = netWeight;
@@ -1036,10 +982,10 @@ public class WmsDocOrderDetails extends BaseEntity
             .append("location", getLocation())
             .append("lotnum", getLotnum())
             .append("remark", getRemark())
-            .append("addTime", getAddTime())
-            .append("addWho", getAddWho())
-            .append("editTime", getEditTime())
-            .append("editWho", getEditWho())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
             .append("netWeight", getNetWeight())
             .append("grossWeight", getGrossWeight())
             .append("cubic", getCubic())

warewms-ams/src/main/java/com/ruoyi/ams/order/domain/WmsDocOrderHeader.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 出库单对象 wms_doc_order_header
  * 
  * @author ruoyi
- * @date 2022-10-28
+ * @date 2022-11-14
  */
 public class WmsDocOrderHeader extends BaseEntity
 {
@@ -51,6 +51,7 @@ public class WmsDocOrderHeader extends BaseEntity
     private String priority;
 
     /** 收货单位id */
+    @Excel(name = "收货单位id")
     private String consigneeId;
 
     /** 收货单位名称 */
@@ -58,123 +59,147 @@ public class WmsDocOrderHeader extends BaseEntity
     private String consigneeName;
 
     /** 国家 */
+    @Excel(name = "国家")
     private String cusCountry;
 
     /** 省 */
+    @Excel(name = "省")
     private String cusProvince;
 
     /** 市 */
+    @Excel(name = "市")
     private String cusCity;
 
     /** 区 */
+    @Excel(name = "区")
     private String cusDistrict;
 
     /** 收货地址 */
+    @Excel(name = "收货地址")
     private String cusAddress;
 
     /** 收货联系人 */
+    @Excel(name = "收货联系人")
     private String cusContact;
 
     /** 收货地址邮编 */
+    @Excel(name = "收货地址邮编")
     private String cusPostcode;
 
     /** 收货联系人邮箱 */
+    @Excel(name = "收货联系人邮箱")
     private String cusEmail;
 
     /** 发运单位id */
+    @Excel(name = "发运单位id")
     private String carrierId;
 
     /** 订单发运时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "订单发运时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date shipmentTime;
 
     /** 发运单位名称 */
+    @Excel(name = "发运单位名称")
     private String carrierName;
 
     /** 发运单号 */
+    @Excel(name = "发运单号")
     private String deliveryNo;
 
     /** 上游单据回传标识 */
+    @Excel(name = "上游单据回传标识")
     private String ediSendFlag;
 
     /** 仓库id */
+    @Excel(name = "仓库id")
     private String warehouseId;
 
     /** 目标货柜(移转目标刀具柜) */
+    @Excel(name = "目标货柜(移转目标刀具柜)")
     private String userdefine1;
 
     /** 预留字段2 */
+    @Excel(name = "预留字段2")
     private String userdefine2;
 
     /** 预留字段3 */
+    @Excel(name = "预留字段3")
     private String userdefine3;
 
     /** 预留字段4 */
+    @Excel(name = "预留字段4")
     private String userdefine4;
 
     /** 预留字段5 */
+    @Excel(name = "预留字段5")
     private String userdefine5;
 
     /** 拣货时保存之前状态 */
+    @Excel(name = "拣货时保存之前状态")
     private String userdefine6;
 
-    /** $column.columnComment */
-    private Date addTime;
-
-    /** $column.columnComment */
-    private String addWho;
-
-    /** $column.columnComment */
-    private Date editTime;
-
-    /** $column.columnComment */
-    private String editWho;
-
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi01;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi02;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi03;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi04;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi05;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi06;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi07;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi08;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private BigDecimal hEdi09;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private BigDecimal hEdi10;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi11;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi12;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi13;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi14;
 
-    /** $column.columnComment */
+    /**  */
+    @Excel(name = "")
     private String hEdi15;
 
-    /** 出库单体信息 */
+    /** 出库单信息 */
     private List<WmsDocOrderDetails> wmsDocOrderDetailsList;
 
     public void setOrderNo(String orderNo) 
@@ -447,42 +472,6 @@ public class WmsDocOrderHeader extends BaseEntity
     {
         return userdefine6;
     }
-    public void setAddTime(Date addTime) 
-    {
-        this.addTime = addTime;
-    }
-
-    public Date getAddTime() 
-    {
-        return addTime;
-    }
-    public void setAddWho(String addWho) 
-    {
-        this.addWho = addWho;
-    }
-
-    public String getAddWho() 
-    {
-        return addWho;
-    }
-    public void setEditTime(Date editTime) 
-    {
-        this.editTime = editTime;
-    }
-
-    public Date getEditTime() 
-    {
-        return editTime;
-    }
-    public void setEditWho(String editWho) 
-    {
-        this.editWho = editWho;
-    }
-
-    public String getEditWho() 
-    {
-        return editWho;
-    }
     public void sethEdi01(String hEdi01) 
     {
         this.hEdi01 = hEdi01;
@@ -663,10 +652,10 @@ public class WmsDocOrderHeader extends BaseEntity
             .append("userdefine4", getUserdefine4())
             .append("userdefine5", getUserdefine5())
             .append("userdefine6", getUserdefine6())
-            .append("addTime", getAddTime())
-            .append("addWho", getAddWho())
-            .append("editTime", getEditTime())
-            .append("editWho", getEditWho())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
             .append("hEdi01", gethEdi01())
             .append("hEdi02", gethEdi02())
             .append("hEdi03", gethEdi03())

warewms-ams/src/main/java/com/ruoyi/ams/order/mapper/WmsDocOrderDetailsMapper.java

@@ -19,7 +19,7 @@ public interface WmsDocOrderDetailsMapper
      * @param orderNo 出库单主键
      * @return 出库单
      */
-     WmsDocOrderDetails selectWmsDocOrderDetailsByOrderNo(String orderNo);
+     List<WmsDocOrderDetails> selectWmsDocOrderDetailsByOrderNo(String orderNo);
 
     /**
      * 查询出库单列表

warewms-ams/src/main/java/com/ruoyi/ams/order/mapper/WmsDocOrderHeaderMapper.java

@@ -60,4 +60,6 @@ public interface WmsDocOrderHeaderMapper {
      * @return 结果
      */
     int deleteWmsDocOrderHeaderByOrderNos(String[] orderNos);
+
+    long selectLineNo(String orderNo);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/IWmsDocOrderDetailsService.java

@@ -17,7 +17,7 @@ public interface IWmsDocOrderDetailsService {
      * @param orderNo 出库单主键
      * @return 出库单
      */
-    WmsDocOrderDetails selectWmsDocOrderDetailsByOrderNo(String orderNo);
+    List<WmsDocOrderDetails> selectWmsDocOrderDetailsByOrderNo(String orderNo);
 
     /**
      * 查询出库单列表

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderDetailsServiceImpl.java

@@ -26,7 +26,7 @@ public class WmsDocOrderDetailsServiceImpl implements IWmsDocOrderDetailsService
      * @return 出库单
      */
     @Override
-    public WmsDocOrderDetails selectWmsDocOrderDetailsByOrderNo(String orderNo)
+    public List<WmsDocOrderDetails> selectWmsDocOrderDetailsByOrderNo(String orderNo)
     {
         return wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
     }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -69,9 +69,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
 
     @Override
     public List<WmsDocOrderDetails> initOrderDetails(String orderNo) {
-        WmsDocOrderDetails query = new WmsDocOrderDetails();
-        query.setOrderNo(orderNo);
-        List<WmsDocOrderDetails> details = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsList(query);
+        List<WmsDocOrderDetails> details = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
         return details;
     }
 
@@ -318,6 +316,8 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
 
     @Override
     public int insertWmsDocOrderDetails(WmsDocOrderDetails wmsDocOrderDetails) {
+        long lineNo = wmsDocOrderHeaderMapper.selectLineNo(wmsDocOrderDetails.getOrderNo());
+        wmsDocOrderDetails.setOrderLineNo(BigDecimal.valueOf(lineNo+1));
         return wmsDocOrderDetailsMapper.insertWmsDocOrderDetails(wmsDocOrderDetails);
     }
 }