推送报错;

mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java

@@ -2300,10 +2300,10 @@ public class StockInOrderApplicationService {
             StockInOrder stockInOrder = stockInOrderService.getById(id);
             Long shipperId = stockInOrder.getShipperId();
             String userNcCode = stockOutOrderMapper.getUserNcCode(shipperId);
-            gwStockInOrder.setBill_no(stockInOrder.getInOrderNumber());
-            gwStockInOrder.setBill_date(stockInOrder.getDocumentDate());
-            gwStockInOrder.setIe_flag("I");
-            gwStockInOrder.setCorp_code(userNcCode);
+            gwStockInOrder.setBillNo(stockInOrder.getInOrderNumber());
+            gwStockInOrder.setBillDate(stockInOrder.getDocumentDate());
+            gwStockInOrder.setIeFlag("I");
+            gwStockInOrder.setCorpCode(userNcCode);
 
 
             List<InMaterialDetail> reservationInMaterialDetails = inMaterialDetailService.list(new LambdaQueryWrapper<InMaterialDetail>().
@@ -2313,22 +2313,23 @@ public class StockInOrderApplicationService {
             for (InMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) {
                 GwInDetail gwInDetail = new GwInDetail();
                 Long materialBaseInfoId = reservationInMaterialDetail.getMaterialBaseInfoId();
-                gwInDetail.setBill_no(gwStockInOrder.getBill_no());
+                gwInDetail.setBillNo(gwStockInOrder.getBillNo());
                 String lotNo = reservationInMaterialDetail.getLotNo();
                 if (lotNo != null) {
                     String[] split = lotNo.split("-");
                     if (split.length == 2) {
-                        gwInDetail.setLine_num(split[1]);
+                        gwInDetail.setLineNum(split[1]);
                     }
                 }
-                gwInDetail.setItem_no(materialBaseInfoId.toString());
-                gwInDetail.setItem_name(reservationInMaterialDetail.getMaterialName());
+
+                gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName());
                 MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoService.getInfo(materialBaseInfoId);
+                gwInDetail.setItemNo(materialBaseInfoPO.getMaterialCode());
                 gwInDetail.setSpec(materialBaseInfoPO.getSpecificationModel());
                 gwInDetail.setUnit(materialBaseInfoPO.getDeclarationUnit());
                 gwInDetail.setQty(reservationInMaterialDetail.getQuantity());
-                gwInDetail.setErp_curr(materialBaseInfoPO.getCurrency());
-                gwInDetail.setErp_price(materialBaseInfoPO.getUnitPrice());
+                gwInDetail.setErpCurr(materialBaseInfoPO.getCurrency());
+                gwInDetail.setErpPrice(materialBaseInfoPO.getUnitPrice());
                 BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
                 BigDecimal quantity = reservationInMaterialDetail.getQuantity();
                 if (unitPrice != null && quantity != null && unitPrice.compareTo(BigDecimal.ZERO) != 0&&quantity.compareTo(BigDecimal.ZERO) != 0) {

mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java

@@ -1579,9 +1579,6 @@ public class StockOutOrderApplicationService {
                     String warehouseCode = materialInventory.getWarehouseCode();
                     String storageLocationCode = materialInventory.getStorageLocationCode();
                     String inLotNo = materialInventory.getLotNumber();
-                    Long kcId = stockOutOrderMapper.getKcId(detail.getLotNo());
-                    if (kcId != null) {
-
                         if (inOrderNumber != null) {
                             item.put("orderINo", inOrderNumber);
                         }
@@ -1608,7 +1605,6 @@ public class StockOutOrderApplicationService {
                             item.put("orderIRow", 1);
                             item.put("billIRow", 1);
                         }
-                    }
                 }
                 orderList.add(item);
             }

mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java

@@ -2794,7 +2794,11 @@ public class StockShelfOrderApplicationService {
                     String[] split = lotNumber.split("-");
                     if (split.length == 2) {
                         detailItem.put("orderRow", split[1]);
+                    } else {
+                        detailItem.put("orderRow", 1);
                     }
+                } else {
+                    detailItem.put("orderRow", 1);
                 }
                 //进口核注清单号
                 detailItem.put("bondInvtNo", materialBaseInfoId);

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/vo/GwInDetail.java

@@ -7,13 +7,13 @@ import java.math.BigDecimal;
 @Data
 public class GwInDetail {
     //订单号
-    private String bill_no;
+    private String billNo;
     //订单行号
-    private String line_num;
+    private String lineNum;
     //物料号
-    private String item_no;
+    private String itemNo;
     //物料名称
-    private String item_name;
+    private String itemName;
     //物料规格
     private String spec;
     //计量单位
@@ -21,9 +21,9 @@ public class GwInDetail {
     //数量
     private BigDecimal qty;
     //企业币制
-    private String erp_curr;
+    private String erpCurr;
     //企业单价
-    private BigDecimal erp_price;
+    private BigDecimal erpPrice;
     //申报总价
     private BigDecimal amount;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/vo/GwStockInOrder.java

@@ -8,13 +8,13 @@ import java.util.List;
 @Data
 public class GwStockInOrder {
     //订单号
-    private String bill_no;
+    private String billNo;
     //进出标记
-    private String ie_flag;
+    private String ieFlag;
     //下单日期
-    private Date bill_date;
+    private Date billDate;
     //客户代码
-    private String corp_code;
+    private String corpCode;
 
     private List<GwInDetail> orderList;