多个bug修改

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

@@ -145,7 +145,9 @@ public class SpsSyncExportStatusController {
             SpsSyncBusResponse spsSyncBusResponse = upBasicService.upAllBus(getRequest(ConstantStatus.SYNC_BUS_TYPE, basicExportStatusRequest.getSyncTime()));
             if (CollUtil.isEmpty(spsSyncBusResponse.getBussinessOriginTypeEntities())
                     && CollUtil.isEmpty(spsSyncBusResponse.getBussinessLocalTypeEntities())
-                    && CollUtil.isEmpty(spsSyncBusResponse.getBussinessTypeEntities())) {
+                    && CollUtil.isEmpty(spsSyncBusResponse.getBussinessTypeEntities())
+                    && CollUtil.isEmpty(spsSyncBusResponse.getEntrustReceEntities())
+                    && CollUtil.isEmpty(spsSyncBusResponse.getBussinessChangeTypeEntities())) {
                 return ResultVOUtils.error(500, "当前暂无更新数据需要同步");
             }
             //同步单据类型

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java

@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -94,6 +95,12 @@ public class InvSubWarehouseController {
         } else {
             invSubWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
         }
+
+
+        InvWarehouseEntity updateEntity = new InvWarehouseEntity();
+        updateEntity.setId(pEntity.getId());
+        updateEntity.setUpdateTime(new Date());
+        invWarehouseService.updateInvWarehouse(updateEntity);
         invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
         boolean b = invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity);
         if (!b) {

api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java

@@ -15,7 +15,7 @@ public class BasicEntrustRecRequest extends ListPageRequest {
     private String userId;
     private Date updateTime;
     private String curInv;
-    private Date lastUpdateTime;
+    private String lastUpdateTime;
     private String entrustSubInv;
     private String invWarehouseCode;
 

api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java

@@ -130,7 +130,9 @@ public class HeartService {
         basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_TYPE);
         spsSyncBusResponse.setTaskId(basicExportStatusEntity2.getId());
         BaseResponse<String> baseResponse2 = spGetHttp.postAllBus(spsSyncBusResponse);
-
+//        if(baseResponse2 == null){
+//            basicExportStatusEntity2.setStatus(ConstantStatus.SYNC_STATUS_FAIL);
+//        }else
         if (baseResponse2.getCode() == 20000) {
             basicExportStatusEntity2.setStatus(1);
         } else {

api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java

@@ -783,7 +783,7 @@ public class IoTransInoutService {
     public void syncprintOrder(String orderId) {
         OrderEntity orderEntity = orderService.findById(orderId);
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
-        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && orderEntity.getErpFk() == null
+        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && StrUtil.isEmpty(orderEntity.getErpFk())
         ) {
 
             //查询单据校验后生成的单据详情

api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java

@@ -252,13 +252,7 @@ public class UpBasicService {
         SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse();
         SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet();
 
-//        BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadBusType");
+        //扫码单据类型
-//        if (basicExportStatusTimeEntity == null) {
-//            basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
-//            basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00");
-//        }
-
-        //业务单据类型
         if (syncDataSetEntity.isTypeScan()) {
             BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
             BeanUtils.copyProperties(spsSyncDataRequest, bussinessTypeFilterRequest);
@@ -266,7 +260,7 @@ public class UpBasicService {
             spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities);
         }
 
-        //扫码单据类型
+        //   业务单据类型
         if (syncDataSetEntity.isTypeBus()) {
             BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
             BeanUtils.copyProperties(spsSyncDataRequest, bussinessLocalTypeFilterRequest);

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

@@ -12,7 +12,7 @@
                 and id = #{id}
             </if>
             <if test="taskId != null and taskId != ''">
-                and taskId = #{taskId}
+                AND taskId LIKE concat('%',#{taskId},'%')
             </if>
             <if test="status != null">
                 and status = #{status}
@@ -44,7 +44,8 @@
         #{updateTime},
         #{scheduleType},
         #{startTime},
-        #{endTime},#{remark}
+        #{endTime},
+        #{remark}
         )
     </insert>
 

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

@@ -7,8 +7,10 @@
             resultType="com.glxp.api.admin.entity.basic.BasicExportStatusEntity">
         select * from basic_export_status
         <where>
-            <if test="id != '' and id!=null">
+
-                and id = #{id}
+
+            <if test="id != null and id != ''">
+                AND id LIKE concat('%',#{id},'%')
             </if>
             <if test="status!=null">
                 and status = #{status}
@@ -39,7 +41,8 @@
         #{updateTime},
         #{scheduleType},
         #{startTime},
-        #{endTime},#{remark}
+        #{endTime},
+        #{remark}
         )
     </insert>