From fbe63e94a6b99f7a23b4599d4f98de57046a33c3 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sat, 25 Jun 2022 09:15:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=EF=BC=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=AD=89bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/controller/inout/StockOrderController.java | 5 ++++- .../sale/admin/req/inout/AddStockOrderChangeRequest.java | 2 ++ .../main/resources/mybatis/mapper/basic/BasicExportDao.xml | 2 +- .../resources/mybatis/mapper/basic/BasicExportTimeDao.xml | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index 6469a53..a1514b0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -396,9 +396,11 @@ public class StockOrderController { String oldOrderId = originOrder.getId(); String replicateNo = originOrder.getReplicateNo(); //复制单号 List originCodes = codesService.findByReceiptId(originOrder.getId()); - originOrder.setActDate(DateUtil.formatDate(new Date())); + originOrder.setActDate(DateUtil.formatDateTime(new Date())); originOrder.setCreateTime(originOrder.getActDate()); originOrder.setFromCorp(addStockOrderChangeRequest.getFromCorp()); + originOrder.setFromSubInvCode(addStockOrderChangeRequest.getFromSubInvCode()); + originOrder.setInvWarehouseCode(addStockOrderChangeRequest.getInvWarehouseCode()); originOrder.setFromCorpId(addStockOrderChangeRequest.getFromCorpId()); originOrder.setCorpOrderId(CustomUtil.getId() + "x"); originOrder.setMainAction(addStockOrderChangeRequest.getMainAction()); @@ -435,6 +437,7 @@ public class StockOrderController { supplementCode.setFromCorpId(originOrder.getFromCorpId()); supplementCode.setFromCorp(originOrder.getFromCorp()); supplementCode.setLocStorageCode(originOrder.getLocStorageCode()); + supplementCode.setInvWarehouseCode(originOrder.getInvWarehouseCode()); supplementCode.setOrderId(supplementOrderNo); //查询补单设置 supplementCode.setAction(originOrder.getAction()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddStockOrderChangeRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddStockOrderChangeRequest.java index adef0f7..e48e347 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddStockOrderChangeRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddStockOrderChangeRequest.java @@ -19,6 +19,8 @@ public class AddStockOrderChangeRequest { private String actDate; private String billType; private String locStorageCode; + private String fromSubInvCode; + private String invWarehouseCode; private String orderId; private String customerId; private String stockOrderId; diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml index 842a3c7..f79be70 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml @@ -23,7 +23,7 @@ and scheduleType = #{scheduleType} - order by updateTime desc + ORDER BY updateTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml index 0cefdf7..e68cc16 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml @@ -14,7 +14,6 @@ and `key` = #{key} - order by updateTime desc