Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -1004,6 +1004,7 @@ public class IoOrderController extends BaseController {
         String supplementOrderNo = orderNo;
         newOrder.setBillNo(supplementOrderNo);
         newOrder.setReplicateNo(null); //新单据的复制单号置空
+        newOrder.setRemark(addOrderChangeRequest.getRemark());
         originOrder.setReplicateNo(orderNo);
         List<IoCodeTempEntity> supplementCodes = new ArrayList<>();
 

src/main/java/com/glxp/api/req/inout/AddOrderChangeRequest.java

@@ -20,6 +20,7 @@ public class AddOrderChangeRequest {
     private String deptCode;
     private String invCode;
     private String orderId;
+    private String remark;
 
     private List<IoCodeEntity> products;
 

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -216,7 +216,8 @@
         basic_products.ggxh,
         inv_product.inCount,
         inv_product.outCount,
-               sum(inv_product.inCount - inv_product.outCount) reCount,
+        inv_product.reCount,
+        -- sum(inv_product.inCount - inv_product.outCount) reCount,
         basic_products.cpmctymc
         from inv_product_detail
         left join inv_product on inv_product_detail.relId = inv_product.relIdFk