数据同步：第三方仓库，扫码单据修改

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java

@@ -108,6 +108,12 @@ public class SpsSyncDownloadController {
             syncDataResponse.setCompanyProductRelevanceEntities(companyProductRelevanceEntities);
             syncDataResponse.setUdiInfoEntities(udiInfoEntities);
             syncDataResponse.setUdiRelevanceEntities(udiRelevanceEntities);
+
+            if (!syncDataSetEntity.isBasicThirdProducts()) {
+
+            }
+
+
         }
 
 
@@ -219,6 +225,7 @@ public class SpsSyncDownloadController {
             if (syncDataSetEntity.isOrderScanFinish()) {
                 OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
                 BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
+                orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes());
                 orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
                 orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED);
                 List<OrderEntity> temps = orderService.findAllByTime(orderFilterRequest);
@@ -230,6 +237,7 @@ public class SpsSyncDownloadController {
             if (syncDataSetEntity.isOrderUnReceive()) {
                 OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
                 BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
+                orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes());
                 orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
                 orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN);
                 List<OrderEntity> temps = orderService.findAllByTime(orderFilterRequest);
@@ -241,6 +249,7 @@ public class SpsSyncDownloadController {
             if (syncDataSetEntity.isOrderUnCheck()) {
                 OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
                 BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
+                orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes());
                 orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
                 List<OrderEntity> temps = orderService.findAllByTime(orderFilterRequest);
                 if (CollUtil.isNotEmpty(temps)) {
@@ -251,6 +260,7 @@ public class SpsSyncDownloadController {
             if (syncDataSetEntity.isOrderScanFinish()) {
                 OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
                 BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
+                orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes());
                 orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
                 orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED);
                 List<OrderEntity> temps = orderService.findAllByTime(orderFilterRequest);

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

@@ -1,5 +1,7 @@
 package com.glxp.sale.admin.controller.thrsys;
 
+import com.glxp.sale.admin.dao.basic.BasicThirdSysDao;
+import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.sale.admin.req.inout.DeleteRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrInvWarehouseRequest;
@@ -29,6 +31,8 @@ public class ThrInvWarehouseController {
 
     @Resource
     ThrInvWarehouseService thrInvWarehouseService;
+    @Resource
+    private BasicThirdSysDao basicThirdSysDao;
 
     @GetMapping("spms/thrsys/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) {
@@ -45,6 +49,9 @@ public class ThrInvWarehouseController {
         for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
             ThrInvWarehouseResponse thrInvWarehouseResponse = new ThrInvWarehouseResponse();
             BeanUtils.copyProperties(thrInvWarehouseEntity, thrInvWarehouseResponse);
+            //查询第三方系统名称
+            BasicThirdSysEntity basicThirdSysEntity = basicThirdSysDao.selectByThirdId(thrInvWarehouseEntity.getThirdSysFk());
+            thrInvWarehouseResponse.setThirdName(basicThirdSysEntity.getThirdName());
             if (pid.equals(thrInvWarehouseEntity.getPid())) {
                 thrInvWarehouseResponse.setChildren(merge(thrInvWarehouseEntities, thrInvWarehouseEntity.getId()));
                 thrInvWarehouseResponses.add(thrInvWarehouseResponse);

api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncOrderResponse.java

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.res.basic;
 
 import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
 import com.glxp.sale.admin.entity.inout.OrderEntity;
+import com.glxp.sale.admin.entity.inout.StockOrderEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseEntity;
 import lombok.Data;
 

api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrInvWarehouseResponse.java

@@ -19,6 +19,16 @@ public class ThrInvWarehouseResponse {
     private Date updateTime;
     private String remark;
 
+    /**
+     * 第三方系统标识
+     */
+    private String thirdSysFk;
+
+    /**
+     * 第三方系统名称
+     */
+    private String thirdName;
+
     private List<ThrInvWarehouseResponse> children;
 
 }

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -512,10 +512,10 @@
                 and receiveStatus = #{receiveStatus}
             </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                and   <![CDATA[    DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
             <if test="filterActions!=null">
-                action in
+                and `action` in
                 <foreach collection="filterActions" item="item" index="index" separator="," open="(" close=")">
                     #{item}
                 </foreach>