diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index f8adfe0..cb666ef 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -337,6 +337,7 @@ public class StockOrderDetailController { stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch()); + stockOrderDetailEntity.setSupId(stockSelectDataEntity.getSupId()); if (StrUtil.isNotEmpty(udiInfoEntity.getPrice())) { stockOrderDetailEntity.setPrice(new BigDecimal(udiInfoEntity.getPrice())); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java index 2f0d5a3..c23c4da 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java @@ -45,4 +45,7 @@ public class StockOrderDetailEntity { private int acceptCount; + + private String measname; + private String supId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockSelectDataEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockSelectDataEntity.java index 2c977be..cd5f7b1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockSelectDataEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockSelectDataEntity.java @@ -8,4 +8,5 @@ public class StockSelectDataEntity { private String batchNo; private String expireDate; private String productDate; + private String supId; } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 9c50ab1..29a6843 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -27,7 +27,7 @@ insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag, - thirdSysFk, status, statusInfo, type, sourceType, + thirdSysFk, status, statusInfo, `type`, sourceType, printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime, updateTime, invWarehouseCode, fromSubInvCode, dept)