diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java index decd51b..9172a27 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java @@ -45,13 +45,11 @@ public class StockOrderEntity { private Date updateTime; //委托验收已完成 private boolean entrustEnd; - - private String billTypeName; private String subInvName; private String invName; - private String dept; private String deptName; + private String remark; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java index fdcc697..6e31de9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java @@ -50,8 +50,8 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String measname; //计量单位 private String udiCode; //条码 private String serialNo; //序列号 - private String nameCode; - private String deptName; + + private String orderRemark; } 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 b9a78f0..ba7c459 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -30,7 +30,7 @@ thirdSysFk, status, statusInfo, type, sourceType, printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime, - updateTime, invWarehouseCode, fromSubInvCode,dept) + updateTime, invWarehouseCode, fromSubInvCode, dept) values (#{id}, #{billNo}, #{billdate}, @@ -45,7 +45,7 @@ #{sourceType}, #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice}, #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime}, - #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode},#{dept}) + #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept}) UPDATE stock_order @@ -284,7 +284,8 @@