同步，单据复制，业务单据编辑等bug修复

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<WarehouseEntity> 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());

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;

api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml

@@ -23,7 +23,7 @@
                 and scheduleType = #{scheduleType}
             </if>
         </where>
-        order by updateTime desc
+        ORDER BY updateTime DESC
     </select>
 
 

api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml

@@ -14,7 +14,6 @@
                 and `key` = #{key}
             </if>
         </where>
-        order by updateTime desc
     </select>