diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
index 582fdffe0..0b169a190 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
@@ -2319,7 +2319,7 @@ public class StockInOrderApplicationService {
             Long shipperId = stockInOrder.getShipperId();
             String userNcCode = stockOutOrderMapper.getUserNcCode(shipperId);
             gwStockInOrder.setBillNo(stockInOrder.getInOrderNumber());
-            gwStockInOrder.setBillDate(stockInOrder.getDocumentDate());
+            gwStockInOrder.setBillDate(stockInOrder.getDocumentDate() == null ? stockInOrder.getCreateTime() : stockInOrder.getDocumentDate());
             gwStockInOrder.setIeFlag("I");
             gwStockInOrder.setCorpCode(userNcCode);
 
@@ -2328,6 +2328,7 @@ public class StockInOrderApplicationService {
                     eq(InMaterialDetail::getInOrderNumber, stockInOrder.getInOrderNumber())
                     .eq(InMaterialDetail::getDelFlag, 1));
             List<GwInDetail> orderList = new LinkedList<>();
+            int index = 1;
             for (InMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) {
                 GwInDetail gwInDetail = new GwInDetail();
                 Long materialBaseInfoId = reservationInMaterialDetail.getMaterialBaseInfoId();
@@ -2336,10 +2337,14 @@ public class StockInOrderApplicationService {
                 if (lotNo != null) {
                     String[] split = lotNo.split("-");
                     if (split.length == 2) {
-                        gwInDetail.setLineNum(split[1]);
+                        gwInDetail.setLineNum(Integer.valueOf(split[1]));
+                    } else {
+                        gwInDetail.setLineNum(index);
                     }
+                } else {
+                    gwInDetail.setLineNum(index);
                 }
-
+                index++;
                 gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName());
                 MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoService.getInfo(materialBaseInfoId);
                 gwInDetail.setItemNo(materialBaseInfoPO.getMaterialCode());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
index 31de0792c..5d1f1cf0a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
@@ -1544,7 +1544,7 @@ public class StockOutOrderApplicationService {
             Map<String, Object> order = new HashMap<>();
             order.put("billNo", stockOutOrder.getOutOrderNumber());
             order.put("ieFlag", "E");
-            order.put("billDate", stockOutOrder.getDocumentDate());
+            order.put("billDate", stockOutOrder.getDocumentDate() == null ? stockOutOrder.getCreateTime() : stockOutOrder.getDocumentDate());
             order.put("corpCode", userNcCode != null ? userNcCode : "");
 
             //  查询出库物料明细
@@ -1563,6 +1563,7 @@ public class StockOutOrderApplicationService {
 
             //  构建明细List<Map>
             List<Map<String, Object>> orderList = new ArrayList<>();
+            int index = 1;
             for (OutMaterialDetail detail : outMaterialDetails) {
                 Map<String, Object> item = new HashMap<>();
                 item.put("billNo", stockOutOrder.getOutOrderNumber());
@@ -1571,7 +1572,11 @@ public class StockOutOrderApplicationService {
                     String[] split = lotNo.split("-");
                     if (split.length == 2) {
                         item.put("lineNum", split[1]);
+                    } else {
+                        item.put("lineNum", index);
                     }
+                } else {
+                    item.put("lineNum", index);
                 }
                 item.put("itemNo", detail.getMaterialCode() != null ? detail.getMaterialCode().toString() : "");
                 item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : "");
@@ -1622,15 +1627,16 @@ public class StockOutOrderApplicationService {
                                 item.put("orderIRow", split[1]);
                                 item.put("billIRow", split[1]);
                             } else {
-                                item.put("orderIRow", 1);
-                                item.put("billIRow", 1);
+                                item.put("orderIRow", index);
+                                item.put("billIRow", index);
                             }
                         } else {
-                            item.put("orderIRow", 1);
-                            item.put("billIRow", 1);
+                            item.put("orderIRow", index);
+                            item.put("billIRow", index);
                         }
                 }
                 orderList.add(item);
+                index++;
             }
             order.put("orderList", orderList);
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/vo/GwInDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/vo/GwInDetail.java
index fcc8a0ad1..1502f9017 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/vo/GwInDetail.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/vo/GwInDetail.java
@@ -9,7 +9,7 @@ public class GwInDetail {
     //订单号
     private String billNo;
     //订单行号
-    private String lineNum;
+    private Integer lineNum;
     //物料号
     private String itemNo;
     //物料名称