diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java index e7704b85..f8046dfe 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java +++ b/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, "当前暂无更新数据需要同步"); } //同步单据类型 diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index 51276fb5..472d1e79 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/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) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java index c2e1b55a..1656166a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java +++ 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; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java index 8086060c..bf4e913e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java +++ b/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 baseResponse2 = spGetHttp.postAllBus(spsSyncBusResponse); - +// if(baseResponse2 == null){ +// basicExportStatusEntity2.setStatus(ConstantStatus.SYNC_STATUS_FAIL); +// }else if (baseResponse2.getCode() == 20000) { basicExportStatusEntity2.setStatus(1); } else { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index c7df142b..5fef8b2e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/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()) ) { //查询单据校验后生成的单据详情 diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java index 9500ebc0..daf3df70 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java +++ b/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); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml index 99246e82..4c66913a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml @@ -12,7 +12,7 @@ and id = #{id} - and taskId = #{taskId} + AND taskId LIKE concat('%',#{taskId},'%') and status = #{status} @@ -44,7 +44,8 @@ #{updateTime}, #{scheduleType}, #{startTime}, - #{endTime},#{remark} + #{endTime}, + #{remark} ) 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 35db6351..353badd5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml +++ b/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 - - and id = #{id} + + + + AND id LIKE concat('%',#{id},'%') and status = #{status} @@ -39,7 +41,8 @@ #{updateTime}, #{scheduleType}, #{startTime}, - #{endTime},#{remark} + #{endTime}, + #{remark} )