修改 2022 10 19号bug

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthPermissionRuleController.java

@@ -39,7 +39,6 @@ public class AuthPermissionRuleController {
     @GetMapping("/admin/auth/permission_rule/index")
     public BaseResponse index() {
 
-
         List<AuthPermissionRule> authPermissionRuleList = authPermissionRuleService.listAll();
         List<AuthPermissionRuleMergeResponse> merge = PermissionRuleTreeUtils.merge(authPermissionRuleList,0L);
 

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java

@@ -112,6 +112,8 @@ public class OrderDetailController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+     
+
         FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
         BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
         filterThrOrderRequest.setPage(filterErpOrderRequest.getPage());

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java

@@ -41,7 +41,7 @@ public class ThrOrderReceiveController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/thrsys/order/insertWeb")
     public BaseResponse insertWeb(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) {
-
+        //editState 1为草稿保存 2为提交保存
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }

api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java

@@ -36,5 +36,6 @@ public class ThrOrderEntity {
 
     private String locStorageCode;
     private String invWarehouseCode;
-    private Integer editStatus;
+    private int editStatus;
+    private int thirdPartyDate;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java

@@ -26,5 +26,6 @@ public class FilterOrderRequest {
     //第三方系统ID
     private String thirdSys;
     private Integer editStatus;
+    private Integer thirdPartyDate;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java

@@ -29,6 +29,7 @@ public class StockOrderPostRequest {
     private Integer editStatus;
     private String invWarehouseCode;
     private String fromSubInvCode;
+    private Integer thirdPartyDate;
     private List<StockOrderDetailEntity> subErpOrders;
     private String customerId;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrOrderRequest.java

@@ -24,6 +24,7 @@ public class FilterThrOrderRequest extends ListPageRequest {
     private String thirdSys;
     private Integer editStatus;
     private String lastUpdateTime;
+    private Integer thirdPartyDate;
 
     private List<ErpOrderResponse> erpOrderResponses;
 }

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml

@@ -42,6 +42,9 @@
             <if test="editStatus!= null">
                 AND editStatus = #{editStatus}
             </if>
+            <if test="thirdPartyDate!= null">
+                AND thirdPartyDate = #{thirdPartyDate}
+            </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
                 <![CDATA[   and DATE_FORMAT(thr_order.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
@@ -55,7 +58,7 @@
         INTO thr_order
                 (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk,
                  startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
-                 remark3,locStorageCode,editStatus,invWarehouseCode)
+                 remark3,locStorageCode,editStatus,invWarehouseCode,thirdPartyDate)
         values (
         #{id},
         #{billNo},
@@ -81,7 +84,8 @@
         #{remark3},
         #{locStorageCode},
         #{editStatus},
-        #{invWarehouseCode}
+        #{invWarehouseCode},
+        #{thirdPartyDate}
         )
     </insert>
 
@@ -145,6 +149,7 @@
             <if test="remark3 != null">remark3=#{remark3},</if>
             <if test="locStorageCode != null">locStorageCode=#{locStorageCode},</if>
             <if test="editStatus != null">editStatus=#{editStatus},</if>
+            <if test="thirdPartyDate != null">thirdPartyDate=#{thirdPartyDate},</if>
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
         </trim>
         WHERE id = #{id}