From 73057d35701d7261d7d0a6bcf26f349c364f965b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 16 Jun 2023 11:47:24 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=88=ABbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicProductCategoryController.java | 15 +++++++++++-- .../BasicProductCategoryServiceImpl.java | 21 +++++++++++++++++++ .../impl/BasicProductCategoryService.java | 4 ++++ .../basic/BasicProductCategoryMapper.xml | 2 +- .../basic/BasicProductCategoryRelMapper.xml | 2 +- 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java index 970124695..617256297 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java @@ -137,6 +137,16 @@ public class BasicProductCategoryController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + //先判断是否有下级 无下级在判断是否有产品 + boolean b = basicProductCategoryService.checkExist(basicProductTypeRequest.getCode()); + if(b){ + return ResultVOUtils.error(555,"此分类下还有子分类,不能删除!"); + } + //判断此分类中是否有产品 + boolean checkrel = basicProductCategoryService.checkrel(basicProductTypeRequest.getCode()); + if(checkrel){ + return ResultVOUtils.error(555,"此分类中绑定产品,不能删除!"); + } String msg = basicProductCategoryService.delectBasicHospType(basicProductTypeRequest); @@ -272,8 +282,6 @@ public class BasicProductCategoryController { @GetMapping("/udiwms/basic/product/category/SelcetproductList") public BaseResponse SelectproductList(FilterUdiRelRequest filterUdiRelRequest) { - - List udiRelevanceResponses=null; @@ -325,6 +333,9 @@ public class BasicProductCategoryController { for (UdiRelevanceResponse udiRelevanceRespons : udiRelevanceResponses) { list.add(udiRelevanceRespons.getId()+""); } + if(!(udiRelevanceResponses != null && udiRelevanceResponses.size()>0)){ + return ResultVOUtils.error(456,"为查询到对应数据!"); + } basicProductTypeRequest.setIds(list); basicProductCategoryService.insertCateRel(basicProductTypeRequest); diff --git a/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java b/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java index 85755c75b..147239181 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java @@ -187,5 +187,26 @@ public class BasicProductCategoryServiceImpl implements BasicProductCategoryServ return basicProductCategoryRelMapper.deleteById(id)>0; } + + @Override + public boolean checkExist(String code) { + List list = basicProductCategoryMapper.selectList(new QueryWrapper().eq("parentCode", code)); + if(list != null && list.size()>0){ + return true; + } + + return false; + } + + @Override + public boolean checkrel(String code) { + + List relList = basicProductCategoryRelMapper.selectList(new QueryWrapper().eq("code", code)); + if(relList != null && relList.size() > 0){ + return true; + } + + return false; + } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductCategoryService.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductCategoryService.java index 1790a78de..d62aa7ef9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductCategoryService.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductCategoryService.java @@ -34,6 +34,10 @@ public interface BasicProductCategoryService { boolean deleterelByid(Integer id); + boolean checkExist(String code); + + boolean checkrel(String code); + } diff --git a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml index b9cb6e927..027fab02b 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml @@ -20,7 +20,7 @@ diff --git a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml index 4378d441b..115436333 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml @@ -75,7 +75,7 @@ - + GROUP BY basic_products.nameCode From 628066d7c64d029d313aa8a87d3cc150e9e6361b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 16 Jun 2023 12:59:48 +0800 Subject: [PATCH 02/12] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/basic/BasicProductCategoryRelMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml index 115436333..284e25759 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml @@ -75,7 +75,7 @@ - GROUP BY basic_products.nameCode + GROUP BY basic_product_category_rel.relId From 4730d6fe7851f87905cbd096be17b03df8844ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 16 Jun 2023 16:17:48 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/BasicCorpController.java | 8 +++++++- .../com/glxp/api/dao/inout/UnitMaintainPlatformDao.java | 2 +- .../api/req/basic/BasicUnitMaintainFilterRequest.java | 1 + .../glxp/api/service/inout/impl/PlatformServiceImpl.java | 7 +++++-- src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml | 6 ++++++ .../mybatis/mapper/inout/UnitMaintainPlatformDao.xml | 3 ++- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index c9362f972..75b1f4c60 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -78,7 +78,13 @@ public class BasicCorpController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List basicUnitMaintainEntities; - basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); + //是供应商的时候拉客户和供应商 + if(basicUnitMaintainFilterRequest.getCorpType() == 2){ + basicUnitMaintainFilterRequest.setCorpType(null); + basicUnitMaintainFilterRequest.setCorpTypeList(new ArrayList<>(Arrays.asList(1, 2))); + }else{ + basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); + } basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java b/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java index f70ad117b..6eeedbd85 100644 --- a/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java +++ b/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java @@ -44,5 +44,5 @@ public interface UnitMaintainPlatformDao { List selectDelectList(@Param("platformId") String platformId); - PlatformLinkResponse selectByUnitld(@Param("unitld") String unitld); + PlatformLinkResponse selectByUnitld(@Param("unitld") String unitld,@Param("sourceAction") String sourceAction); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index 679c72612..5988d335f 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -26,5 +26,6 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest { private Integer outType; private Boolean isDownThrSys; private String lastUpdateTime; + private List corpTypeList; ListthrCorpEntities; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java index 4deeda1a7..8a91ab2ad 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java @@ -318,7 +318,7 @@ public class PlatformServiceImpl implements PlatformService { return ResultVOUtils.error(999, "该单据不存在!"); } //查询客户关联信息 - PlatformLinkResponse platformLinkRespons = unitMaintainPlatformDao.selectByUnitld(ioOrderEntity.getFromCorp()); + PlatformLinkResponse platformLinkRespons = unitMaintainPlatformDao.selectByUnitld(ioOrderEntity.getFromCorp(),ioOrderEntity.getAction()); if(platformLinkRespons == null){ return ResultVOUtils.error(999, "该单没有设置补单条件!"); } @@ -353,7 +353,10 @@ public class PlatformServiceImpl implements PlatformService { ioOrderInvoiceEntity.setLicenseUrl("as" + ioOrderInvoiceEntity.getLicenseUrl()); } } - relayFile(list,platformLinkRespons.getHost()); + //没有图片的时候不用上传 + if(list.size()>0){ + relayFile(list,platformLinkRespons.getHost()); + } //组装数据 String host = platformLinkRespons.getHost(); diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 83ac4e605..37dd870b1 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -30,6 +30,12 @@ AND corpType = #{corpType} + + AND corpType in + + #{item} + + AND (outType ]]> #{outType} or outType is NULL) diff --git a/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml b/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml index cf1c52b7e..1d99ece2a 100644 --- a/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml +++ b/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml @@ -183,6 +183,7 @@ a1.host FROM io_unit_maintain_platform io inner join auth_platform a1 on a1.id = io.platformId - where io.unitId = #{unitld} + where io.unitId = #{unitld} and io.sourceAction = #{sourceAction} + GROUP BY io.unitId \ No newline at end of file From 47b1bd2cd41f1679724f51c0faec47a7bc040a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 16 Jun 2023 18:03:30 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/PlatformController.java | 8 +++++++- .../com/glxp/api/dao/inout/UnitMaintainPlatformDao.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/PlatformController.java b/src/main/java/com/glxp/api/controller/inout/PlatformController.java index 3326e6ea0..ac5b7b7aa 100644 --- a/src/main/java/com/glxp/api/controller/inout/PlatformController.java +++ b/src/main/java/com/glxp/api/controller/inout/PlatformController.java @@ -11,6 +11,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.dao.inout.UnitMaintainPlatformDao; import com.glxp.api.entity.inout.UnitMaintainPlatformEntity; import com.glxp.api.entity.system.PlatformEntity; import com.glxp.api.req.inout.PlatformLinkRequest; @@ -41,11 +42,13 @@ public class PlatformController { private PlatformService platformService; @Resource private CustomerService customerService; + @Resource + private UnitMaintainPlatformDao unitMaintainPlatformDao; @AuthRuleAnnotation("") @PostMapping("/udiwms/platform/remove") public BaseResponse remove(@RequestBody PlatformEntity platformEntity) { - if (platformService.remove(platformEntity.getId()) > 0) { + if (unitMaintainPlatformDao.deleteById(platformEntity.getId())) { ResultVOUtils.success("删除成功"); } return ResultVOUtils.error(500, "删除失败"); @@ -119,6 +122,9 @@ public class PlatformController { public BaseResponse update(@RequestBody PlatformLinkRequest platformLinkRequest) { //判断此数据是否重复 String verifyResult = platformService.verifyUnitMaintainPlatform(platformLinkRequest); + + + if (!verifyResult.equals("success")) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, verifyResult); } diff --git a/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java b/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java index 6eeedbd85..2b7df6040 100644 --- a/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java +++ b/src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java @@ -38,7 +38,7 @@ public interface UnitMaintainPlatformDao { UnitMaintainPlatformEntity findLinkData(@Param("customerId") long customerId, @Param("action") String action, @Param("unitId") String unitId); - void deleteById(String id); + boolean deleteById(String id); Long selectCount(@Param("unitId") String unitId, @Param("action") String action); From 77256a15163154ab4a1ccb46db6177e798dffe98 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 16 Jun 2023 18:07:08 +0800 Subject: [PATCH 05/12] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/BasicBusTypePreController.java | 3 +++ src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java | 1 + src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 1 + 3 files changed, 5 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index 3391c2feb..41244d4e6 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -173,6 +173,9 @@ public class BasicBusTypePreController { if (result) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); } + if(basicBusTypePreEntity.getAction().equals(basicBusTypePreEntity.getOriginAction())){ + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "出入库单与目标出入库单相同！"); + } basicBusTypePreService.updateBusChangeType(basicBusTypePreEntity); } else { diff --git a/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java index ffd1bfb31..ba0842b41 100644 --- a/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java @@ -16,4 +16,5 @@ public class InnerOrderEntity { private String remark; private String createUser; private int status; + private String createByName; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 32d8c836d..121699f69 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1556,6 +1556,7 @@ AND b1.cpmctymc like concat('%', #{productName}, '%') + order by b1.id desc From 86f084836e845acb53d475576e2ca404ab545952 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 17 Jun 2023 11:30:06 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E9=80=89=E5=85=A5=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/LoginController.java | 5 +- .../controller/basic/BasicCorpController.java | 10 +- .../inout/IoCodeTempController.java | 15 +- .../inout/IoOrderDetailBizController.java | 26 +- .../controller/inv/InvProductController.java | 1 - .../controller/inv/UdiTraceController.java | 6 +- .../purchase/IoPurChangeService.java | 13 +- .../sync/SpsSyncExportStatusController.java | 6 +- .../system/DeviceKeyController.java | 6 +- .../controller/thrsys/ThrOrderController.java | 25 +- .../com/glxp/api/dao/basic/BasicCorpDao.java | 2 +- .../api/entity/basic/UdiProductEntity.java | 3 + .../api/idc/service/impl/IdcServiceImpl.java | 18 +- .../java/com/glxp/api/idc/utils/DBAUtils.java | 94 +++---- .../api/res/thrsys/ThrErpOrderResponse.java | 2 +- .../glxp/api/res/thrsys/ThrOrderResponse.java | 5 +- .../res/thrsys/ThrUnitMaintainResponse.java | 2 +- .../basic/BasicBackUpdateProductService.java | 3 +- .../api/service/basic/BasicCorpService.java | 2 +- .../basic/BasicUpdateProductService.java | 4 +- .../api/service/basic/UdiContrastService.java | 1 - .../basic/impl/BasicCorpServiceImpl.java | 12 +- .../BasicProductsImportLogServiceImpl.java | 4 +- .../api/service/inout/IoAddInoutService.java | 9 +- .../service/inout/IoChangeInoutService.java | 6 +- .../api/service/inout/IoGenInvService.java | 14 - .../inout/impl/IoOrderServiceImpl.java | 6 +- .../InvPreInProductDetailServiceImpl.java | 10 +- .../impl/InvPreProductDetailServiceImpl.java | 8 +- .../inv/impl/InvProductDetailServiceImpl.java | 5 +- .../inv/impl/InvRemindMsgServiceImpl.java | 10 +- .../purchase/impl/SupCertRemindMsgImpl.java | 14 +- .../glxp/api/service/sync/HeartService.java | 26 +- .../glxp/api/service/sync/UpBasicService.java | 35 ++- .../api/service/sync/UpThrDataService.java | 10 +- .../service/thrsys/ThrOrdersDlService.java | 265 +++--------------- .../service/thrsys/ThrUnitImportService.java | 26 +- .../thrsys/impl/ThrProductsServiceImpl.java | 2 +- .../com/glxp/api/task/IoStatOrderTask.java | 8 +- .../util/{DateUtil.java => MsDateUtil.java} | 15 +- src/main/resources/application.yml | 2 +- .../mybatis/mapper/basic/BasicCorpDao.xml | 10 +- .../mybatis/mapper/thrsys/ThrOrderDao.xml | 36 +-- 43 files changed, 272 insertions(+), 510 deletions(-) rename src/main/java/com/glxp/api/util/{DateUtil.java => MsDateUtil.java} (97%) diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index d9c918a33..27f09c488 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -24,7 +24,6 @@ import com.glxp.api.service.auth.*; import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -113,7 +112,7 @@ public class LoginController extends BaseController { Map map = new HashMap<>(); map.put("id", authAdmin.getId()); map.put("token", token); - map.put("time", DateUtil.getDateTime()); + map.put("time", MsDateUtil.getDateTime()); LoginResponse loginResponse = new LoginResponse(); loginResponse.setId(authAdmin.getId() + ""); loginResponse.setToken(token); @@ -185,7 +184,7 @@ public class LoginController extends BaseController { Map map = new HashMap<>(); map.put("id", authAdmin.getId()); map.put("token", token); - map.put("time", DateUtil.getDateTime()); + map.put("time", MsDateUtil.getDateTime()); return ResultVOUtils.success(map); } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 75b1f4c60..280b88671 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -79,10 +79,12 @@ public class BasicCorpController { } List basicUnitMaintainEntities; //是供应商的时候拉客户和供应商 - if(basicUnitMaintainFilterRequest.getCorpType() == 2){ + if (basicUnitMaintainFilterRequest.getCorpType() == null) { + basicUnitMaintainFilterRequest.setCorpType(2); + } else if (basicUnitMaintainFilterRequest.getCorpType() == 2) { basicUnitMaintainFilterRequest.setCorpType(null); basicUnitMaintainFilterRequest.setCorpTypeList(new ArrayList<>(Arrays.asList(1, 2))); - }else{ + } else { basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); } basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); @@ -258,12 +260,10 @@ public class BasicCorpController { return ResultVOUtils.error(500, "往来单位接口地址未定义"); if (basicThirdSysDetailEntity.getEnabled()) { thrUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest); - } else { return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用"); } - return ResultVOUtils.success("后台正在添加，请稍后刷新查看！"); } @@ -522,7 +522,7 @@ public class BasicCorpController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/selectCorpList") - public BaseResponse selectCorpList(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) { + public BaseResponse selectCorpList(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) { List getCorpList = basicUnitMaintainService.selectCorpList(basicUnitMaintainFilterRequest); return ResultVOUtils.success(getCorpList); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 97b3f21d2..ece1b278a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1,8 +1,6 @@ package com.glxp.api.controller.inout; -import cn.hutool.Hutool; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.UUID; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -25,10 +23,6 @@ import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.entity.inv.InvPreinDetailEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.inout.AddEnterCodeRequest; import com.glxp.api.req.inout.AddOrderRequest; @@ -44,7 +38,6 @@ import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; import com.glxp.api.service.inv.*; -import com.glxp.api.service.purchase.SupProductService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import com.glxp.api.util.udi.FilterUdiUtils; @@ -429,7 +422,7 @@ public class IoCodeTempController extends BaseController { if (bussinessTypeEntity.getCheckVailDate() == 1 && !addOrderRequest.isIgnoreExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); - long expireTime = DateUtil.parseDateExpire(expireDate); + long expireTime = MsDateUtil.parseDateExpire(expireDate); if (expireTime - System.currentTimeMillis() < 0) { return ResultVOUtils.error(504, "当前产品已过期,是否确定继续添加?"); } @@ -438,7 +431,7 @@ public class IoCodeTempController extends BaseController { if (bussinessTypeEntity.getCheckExpire() == 2) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); - long expireTime = DateUtil.parseDateExpire(expireDate); + long expireTime = MsDateUtil.parseDateExpire(expireDate); if (expireTime - System.currentTimeMillis() < 0) { return ResultVOUtils.error(604, "当前产品已过期,无法添加?"); } @@ -455,7 +448,7 @@ public class IoCodeTempController extends BaseController { if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); - long expireTime = DateUtil.parseDateExpire(expireDate); + long expireTime = MsDateUtil.parseDateExpire(expireDate); long recentTieme = Math.abs(recent * 24 * 60 * 60 * 1000); long resultTime = expireTime - System.currentTimeMillis(); @@ -471,7 +464,7 @@ public class IoCodeTempController extends BaseController { if (bussinessTypeEntity.getCheckVailDate() == 2 && recent > 0) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); - long expireTime = DateUtil.parseDateExpire(expireDate); + long expireTime = MsDateUtil.parseDateExpire(expireDate); long recentTieme = Math.abs(recent * 24 * 60 * 60 * 1000); long resultTime = expireTime - System.currentTimeMillis(); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 3268bcae6..cd9c634ed 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -49,6 +49,7 @@ import com.glxp.api.service.thrsys.ThrOrderDetailService; import com.glxp.api.service.thrsys.ThrOrderService; import com.glxp.api.service.thrsys.ThrSystemBusApiService; import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.OrderNoTypeBean; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -271,15 +272,15 @@ public class IoOrderDetailBizController extends BaseController { //获取往来信息 if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) {//内部调拨 - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByThrCode(thrOrderEntity.getCorpId(), thrOrderEntity.getThirdSysFk()); orderEntity.setFromDeptCode(invWarehouseEntity.getParentId()); orderEntity.setFromInvCode(invWarehouseEntity.getCode()); - } else if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { //往来信息 + } else { //往来信息 BasicCorpEntity basicCorpEntity = basicCorpService.selectByThirdId(thrOrderEntity.getCorpId(), thrOrderEntity.getThirdSysFk()); + if (basicCorpEntity == null) { + return ResultVOUtils.error(500, "往来单位信息未关联！"); + } orderEntity.setFromCorp(basicCorpEntity.getErpId()); - } else { - orderEntity.setFromCorp(thrOrderEntity.getCorpId()); } orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); @@ -306,7 +307,9 @@ public class IoOrderDetailBizController extends BaseController { ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory()); ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname()); ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh()); - ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(Double.valueOf(udiRelevanceResponse.getPrice()))); + if (udiRelevanceResponse.getPrice() != null) { + ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(Double.valueOf(udiRelevanceResponse.getPrice()))); + } ioOrderDetailBizEntity.setSupId(udiRelevanceResponse.getCustomerId() + ""); } else { ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName()); @@ -315,7 +318,6 @@ public class IoOrderDetailBizController extends BaseController { ioOrderDetailBizEntity.setManufacturer(thrOrderDetailEntity.getManufactory()); ioOrderDetailBizEntity.setSpec(thrOrderDetailEntity.getSpec()); ioOrderDetailBizEntity.setPrice(thrOrderDetailEntity.getPrice()); - if (udiRelevanceEntities.size() > 1) { String bindRlIds = ""; for (UdiRlSupResponse temp : udiRelevanceEntities) { @@ -326,11 +328,15 @@ public class IoOrderDetailBizController extends BaseController { } ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo()); - ioOrderDetailBizEntity.setProductDate(thrOrderDetailEntity.getProductDate()); - ioOrderDetailBizEntity.setExpireDate(thrOrderDetailEntity.getExpireDate()); + if (StrUtil.isNotEmpty(thrOrderDetailEntity.getProductDate())) { + ioOrderDetailBizEntity.setProductDate(MsDateUtil.getDiFormat(thrOrderDetailEntity.getProductDate())); + } + + if (StrUtil.isNotEmpty(thrOrderDetailEntity.getExpireDate())) { + ioOrderDetailBizEntity.setExpireDate(MsDateUtil.getDiFormat(thrOrderDetailEntity.getExpireDate())); + } ioOrderDetailBizEntity.setBatchNo(thrOrderDetailEntity.getBatchNo()); ioOrderDetailBizEntity.setCount(thrOrderDetailEntity.getCount()); - if (StrUtil.isNotEmpty(thrOrderDetailEntity.getSupId())) { BasicCorpEntity basicCorpEntity = basicCorpService.selectByThirdId(thrOrderDetailEntity.getSupId(), thrOrderEntity.getThirdSysFk()); ioOrderDetailBizEntity.setSupId(basicCorpEntity.getErpId()); @@ -586,7 +592,7 @@ public class IoOrderDetailBizController extends BaseController { List ioOrderInvoiceResponses = orderDetailBizService.filterListInv(filterOrderDetailBizRequest1); if (list.size() == 0) { ioOrderDetailBizEntity.setRegStatus(false); - }else{ + } else { ioOrderDetailBizEntity.setRegStatus(true); } orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index 1283fc3a8..cffcca4b5 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -24,7 +24,6 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.service.inv.InvProductDetailService; import com.glxp.api.service.inv.InvProductService; -import com.glxp.api.util.DateUtil; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index 5963f4ea0..d4e491e4d 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -9,7 +9,6 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inv.InvProductDetailEntity; -import com.glxp.api.req.basic.FilterUdiInfoRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inv.FilterCodeTraceRequest; @@ -22,9 +21,8 @@ import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inv.InvProductDetailService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.udi.FilterUdiUtils; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -105,7 +103,7 @@ public class UdiTraceController { udiTraceResponse.setOrderId(item.getBillNo()); udiTraceResponse.setBillTypeName(item.getBillTypeName()); udiTraceResponse.setFromCorp(item.getFromName()); - udiTraceResponse.setActDate(DateUtil.formatDate(item.getCreateTime())); + udiTraceResponse.setActDate(MsDateUtil.formatDate(item.getCreateTime())); if (finalUdiRelevance != null) { udiTraceResponse.setYlqxzcrbarmc(finalUdiRelevance.getYlqxzcrbarmc()); udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc()); diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 256e4d8b2..961d511c6 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -1,27 +1,24 @@ package com.glxp.api.controller.purchase; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.*; import com.glxp.api.service.basic.IBasicBusTypeChangeService; -import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.ReceiveService; import com.glxp.api.service.inout.ReceivedetailService; import com.glxp.api.service.purchase.*; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import org.springframework.stereotype.Service; @@ -139,8 +136,8 @@ public class IoPurChangeService { purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser()); purPlanEntity.setApplyRemark(purApplyEntity.getRemark()); if (basicBusTypeChangeEntity.getBusBeforeTime() != null) { - purPlanEntity.setCreateTime(DateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); - purPlanEntity.setUpdateTime(DateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); + purPlanEntity.setCreateTime(MsDateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); + purPlanEntity.setUpdateTime(MsDateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); } else { purPlanEntity.setCreateTime(purApplyEntity.getCreateTime()); purPlanEntity.setUpdateUser(purApplyEntity.getAuditUser()); @@ -226,8 +223,8 @@ public class IoPurChangeService { purOrderEntity.setCreateUser(purPlanEntity.getAuditUser()); purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser()); if (basicBusTypeChangeEntity.getBusBeforeTime() != null) { - purOrderEntity.setCreateTime(DateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime())); - purOrderEntity.setUpdateTime(DateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime())); + purOrderEntity.setCreateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime())); + purOrderEntity.setUpdateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime())); } else { purOrderEntity.setCreateTime(new Date()); purOrderEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index 4276877f0..8fda979bf 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -22,7 +22,7 @@ import com.glxp.api.service.sync.BasicDownloadService; import com.glxp.api.service.sync.BasicExportService; import com.glxp.api.service.sync.BasicExportTimeService; import com.glxp.api.service.sync.HeartService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.RedisUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -219,8 +219,8 @@ public class SpsSyncExportStatusController { CompletableFuture future = CompletableFuture.runAsync(() -> { switch (req.getExportType()) { case IO_ORDER: - heartService.uploadAllBusOrder(DateUtil.formatDateTime(req.getSyncTime())); - heartService.uploadAllOrder(DateUtil.formatDateTime(req.getSyncTime())); + heartService.uploadAllBusOrder(MsDateUtil.formatDateTime(req.getSyncTime())); + heartService.uploadAllOrder(MsDateUtil.formatDateTime(req.getSyncTime())); break; default: heartService.pushData(syncDataSetEntity, req.getSyncTime(), req.getExportType()); diff --git a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java index 29c207785..792c2ba40 100644 --- a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java +++ b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java @@ -6,7 +6,7 @@ import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.FilterDeviceKeyRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.SysPdaKeyService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -53,7 +53,7 @@ public class DeviceKeyController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - sysPdaKeyEntity.setDate(DateUtil.getDate()); + sysPdaKeyEntity.setDate(MsDateUtil.getDate()); sysPdaKeyService.updateDeviceKey(sysPdaKeyEntity); return ResultVOUtils.success("审核成功"); @@ -91,7 +91,7 @@ public class DeviceKeyController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - sysPdaKeyEntity.setDate(DateUtil.getDateTime()); + sysPdaKeyEntity.setDate(MsDateUtil.getDateTime()); sysPdaKeyEntity.setIsCheck(0); sysPdaKeyService.insertDeviceKey(sysPdaKeyEntity); return ResultVOUtils.success("1"); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 5d3a31890..1ef89083a 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -11,6 +11,7 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.*; +import com.glxp.api.http.ErpOrderClient; import com.glxp.api.http.HttpOkClient; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.system.DeleteRequest; @@ -48,7 +49,8 @@ public class ThrOrderController { private SystemParamConfigService systemParamConfigService; @Resource private IThrBusTypeOriginService iThrBusTypeOriginService; - + @Resource + ErpOrderClient erpOrderClient; @Resource HttpOkClient httpOkClient; @@ -282,14 +284,13 @@ public class ThrOrderController { @PostMapping("/udiwms/thrsys/orders/orderDownload") public BaseResponse orderDownload(@RequestBody FilterThrOrderRequest filterThrProductsRequest) { String data = (String) redisUtil.get(Constant.dlThrOrders); - if (false) {//(data != null && data.equals("true")) { + if ((data != null && data.equals("true"))) { return ResultVOUtils.error(500, "当前任务正在下载更新业务单据信息，请稍后重试！"); } else { - redisUtil.set(Constant.dlThrOrders, "true", 10 * 30); -// if (filterThrProductsRequest.getBillAction() == null) { -// return ResultVOUtils.error(500, "未选择业务类型！"); -// } - + redisUtil.set(Constant.dlThrOrders, "true", 1 * 60); + if (filterThrProductsRequest.getBillAction() == null) { + return ResultVOUtils.error(500, "未选择业务类型！"); + } ThrOrderImportLogEntity thrOrderImportLogEntity = new ThrOrderImportLogEntity(); String genKey = CustomUtil.getId(); thrOrderImportLogEntity.setGenKey(genKey); @@ -363,11 +364,11 @@ public class ThrOrderController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } -// -// if (filterErpOrderRequest.getIsDownThrSys()) { -// BaseResponse> responseBaseResponse = erpOrderClient.getErpOrderResponse(filterErpOrderRequest); -// return responseBaseResponse; -// } + + if (filterErpOrderRequest.getIsDownThrSys()) { + BaseResponse> responseBaseResponse = erpOrderClient.getThrOrderResponse(filterErpOrderRequest); + return responseBaseResponse; + } ThrSystemDetailEntity thrSystemDetailEntity = iThrBusTypeOriginService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl"); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index c9874040c..bc912dfa7 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -16,7 +16,7 @@ public interface BasicCorpDao extends BaseMapperPlus count = new HashMap(); count.put("sql", "select count(*) from idc_delete where " + where); int total = dbDao.count(count); @@ -425,7 +425,7 @@ public class IdcServiceImpl implements IdcService { if (!StringUtils.isEmpty(updateTimeColumn)) { - sqlWhere += " " + updateTimeColumn + " between cast('" + lastUpdateTime + "' as datetime) and cast('" + DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss") + "' as datetime)"; + sqlWhere += " " + updateTimeColumn + " between cast('" + lastUpdateTime + "' as datetime) and cast('" + MsDateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss") + "' as datetime)"; //sqlWhere += " and not exists (select fkId from idc_record where type='" + tnames[2] + "' and fkId=" + tnames[2] + "." + keyColumn + " and createTime>date_sub(now(),interval 15 MINUTE))"; } else { sqlWhere = "not exists (select fkId from idc_record where type='" + tnames[2] + "' and fkId=" + tnames[2] + "." + keyColumn + ")"; @@ -449,13 +449,13 @@ public class IdcServiceImpl implements IdcService { if (!StringUtils.isEmpty(cron)) { CronSequenceGenerator cronSequenceGenerator = new CronSequenceGenerator(cron); - Date nextTimePoint = cronSequenceGenerator.next(DateUtil.parseDate(lastUpdateTime)); + Date nextTimePoint = cronSequenceGenerator.next(MsDateUtil.parseDate(lastUpdateTime)); sync = nextTimePoint.before(nowUpdateTime); } if (sync) { result = syncMasterData(map, isUpload, syncIp); if (result) { - setUpdateTime(tnames[2] + "." + tnames[0] + "." + tnames[1], DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss")); + setUpdateTime(tnames[2] + "." + tnames[0] + "." + tnames[1], MsDateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss")); } } //} @@ -546,7 +546,7 @@ public class IdcServiceImpl implements IdcService { JSONObject json = JSONObject.parseObject(content); String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/"; String backFileSlash = backFilePath.substring(backFilePath.length() - 1).equals("/") ? "" : "/"; - String datePath = DateUtil.formatDate(new Date(), "yyyy-MM-dd"); + String datePath = MsDateUtil.formatDate(new Date(), "yyyy-MM-dd"); String fileName = filePath + filePathSlash + datePath + "/" + json.getString("messageType") + "-" + json.getString("messageId") + ".udi"; String backFileName = backFilePath + backFileSlash + datePath + "/" + json.getString("messageType") + "-" + json.getString("messageId") + ".udi"; if (!FileUtils.makeDirectory(filePath + filePathSlash + datePath)) @@ -842,7 +842,7 @@ public class IdcServiceImpl implements IdcService { boolean isEnd, boolean isReceive) { try { String content = JSON.toJSONString(json); - String datePath = DateUtil.formatDate(new Date(), "yyyy-MM-dd"); + String datePath = MsDateUtil.formatDate(new Date(), "yyyy-MM-dd"); String fileName = filePath + datePath + "/" + json.get("messageType") + "-" + json.get("messageId") + ".udi"; String backFileName = backFilePath + datePath + "/" + json.get("messageType") + "-" + json.get("messageId") + ".udi"; if (!FileUtils.makeDirectory(filePath + datePath)) @@ -1011,7 +1011,7 @@ public class IdcServiceImpl implements IdcService { if (list.get(i).get(keyColumn[z]) != null && !StringUtils.isEmpty(list.get(i).get(keyColumn[z]).toString())) { updateWhere += !StringUtils.isEmpty(updateWhere) ? " and " : " "; String value = list.get(i).get(keyColumn[z]) != null ? list.get(i).get(keyColumn[z]).toString() : ""; - value = keyDataType[z].equals("D") ? "cast('" + DateUtil.formatDate(IDCUtils.parseDate(value), "yyyy-MM-dd HH:mm:ss") + "' as datetime)" : value; + value = keyDataType[z].equals("D") ? "cast('" + MsDateUtil.formatDate(IDCUtils.parseDate(value), "yyyy-MM-dd HH:mm:ss") + "' as datetime)" : value; updateWhere += keyColumn[z] + " = " + (keyDataType[z].equals("C") ? "'" : "") + value + (keyDataType[z].equals("C") ? "'" : ""); } } @@ -1397,7 +1397,7 @@ public class IdcServiceImpl implements IdcService { String updateTime = ""; Map map = dbDao.get("select * from idc_status where id='" + id + "'"); if (map != null && map.get("id") != null) { - updateTime = DateUtil.formatDate(IDCUtils.parseDate(map.get("statusTime").toString()), "yyyy-MM-dd HH:mm:ss"); + updateTime = MsDateUtil.formatDate(IDCUtils.parseDate(map.get("statusTime").toString()), "yyyy-MM-dd HH:mm:ss"); } else { //国家库数据 if (id.equals("productinfo")) { diff --git a/src/main/java/com/glxp/api/idc/utils/DBAUtils.java b/src/main/java/com/glxp/api/idc/utils/DBAUtils.java index 872902f2a..ab175b388 100644 --- a/src/main/java/com/glxp/api/idc/utils/DBAUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/DBAUtils.java @@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; @@ -20,7 +20,7 @@ import com.glxp.api.util.DateUtil; public class DBAUtils { private static final Logger logger = LoggerFactory.getLogger(DBAUtils.class); private static final String keywords = ",limit,offset,sort,order,isLike,menuId,menuCode,page,isAuto,pageNo,pageSize,pageNum,sqlOrder,join,"; - + /*解析where条件*/ public static String parseWhere(String sql,Map columns,Map params,String dataWhere) { return parseWhere(sql,columns,params,dataWhere,false); @@ -29,7 +29,7 @@ public class DBAUtils { String where=""; boolean isAnd0 = false; boolean isLike = params!=null&¶ms.get("isLike")!=null&¶ms.get("isLike").toString().equals("true") ? true : false; - + if(sql.contains("sqlWhere")||!sql.contains(""); String str = sql.substring(b+1,c); int e1 = str.indexOf("#{"); @@ -99,8 +99,8 @@ public class DBAUtils { } sql = sql.length()>c+5 ? sql.substring(0,a) +str+sql.substring(c+5) : sql.substring(0,a) +str; } - - } + + } if(sql.contains("")) { sql = n>0 ? sql.replaceAll("", " where ") : sql.replaceAll("", ""); if(!StringUtils.isEmpty(dataWhere)&&!sql.contains("sqlWhere")) { @@ -113,7 +113,7 @@ public class DBAUtils { int a1,a2,b1,b2; a1 = sql.indexOf("[==isLike]"); a2 = sql.indexOf("",a1+1); - + if(a1>0&&a2>0) { if(isLike) { sql = sql.length()>a2+5 ? sql.substring(0,a1)+sql.substring(a1 +10, a2) +sql.substring(a2+5) : sql.substring(0,a1)+sql.substring(a1 +10, a2); @@ -131,11 +131,11 @@ public class DBAUtils { } } } - + sql =parseParams(sql,columns,params); return sql; } - + public static String parseParams(String sql,Map columns,Map params) { String[] iStr={"#{","${"}; for(int k=0;k<2;k++) { @@ -153,12 +153,12 @@ public class DBAUtils { sql = sql.substring(0,a1)+(dataType.equals("0") ? "'" : "")+value+(dataType.equals("0") ? "'" : "")+sql.substring(a2 +1); } } - + return sql; - + } - - + + /*生成where条件*/ public static String convertWhere(Map colums,Map params,String dataWhere) { String where=convertWhere(colums,params,dataWhere,""); @@ -181,7 +181,7 @@ public class DBAUtils { if(obj!=null) value = obj.toString(); if(!StringUtils.isEmpty(value)&&!keywords.contains(","+key+",")&&(StringUtils.isEmpty(sql)||(!StringUtils.isEmpty(sql)&&!sql.contains("{"+key+"}")))) { - + if(key.equals("sqlWhere")||key.equals("join")) { where+=(!StringUtils.isEmpty(where) ? " and " : "") +" "+value; } else { @@ -189,12 +189,12 @@ public class DBAUtils { String wh = ""; for (String cn:cns) { String columnName = cn;//StringUtils.propertyToField(cn); - - + + if(colums!=null&&isKey&&colums.get(cn)==null) { logger.error("列名"+columnName+"不存在,属性"+cn+"错误."); } else { - if(!StringUtils.isEmpty(wh)) + if(!StringUtils.isEmpty(wh)) wh+=" or "; if(isLike) { wh+="instr("+columnName+",'"+value+"')>0"; @@ -207,21 +207,21 @@ public class DBAUtils { } } } - + if(!StringUtils.isEmpty(dataWhere)) { if(!StringUtils.isEmpty(where)) { where = "("+where+") and ("+dataWhere+")"; } else { where = dataWhere; } - } - if(!StringUtils.isEmpty(where)) + } + if(!StringUtils.isEmpty(where)) where = "("+where+")"; return where; } - - - + + + /*生成insert语句*/ public static String parseInsert(Map params,Map columns) { String ins=""; @@ -229,28 +229,28 @@ public class DBAUtils { String sql=""; for(String key : columns.keySet()){ String value = ""; - + if(params.get(key)!=null) value = params.get(key).toString(); Map map = (Map) columns.get(key); String dataType = map.get("dataType").toString(); String extra = map.get("extra")!=null&&map.get("extra").toString().toLowerCase().contains("auto") ? "A" : "N"; - + if(map.get("columnKey").toString().equals("PRI")&&extra.equals("N")) { if(StringUtils.isEmpty(value)) { - + } } - + value = DBAUtils.escape(value); if(!StringUtils.isEmpty(value)) { if(!StringUtils.isEmpty(ins)) ins+=","; ins+=map.get("columnName").toString(); - + if(!StringUtils.isEmpty(vas)) vas+=","; - + if(StringUtils.isEmpty(value)) { vas+="null"; } else { @@ -263,39 +263,39 @@ public class DBAUtils { Date date = new Date(); if(StringUtils.isNumeric(value)) { date = new Date(Long.valueOf(value)); - str = DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"); + str = MsDateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"); } else { - str = DateUtil.formatDate(IDCUtils.parseDate(value),"yyyy-MM-dd HH:mm:ss"); + str = MsDateUtil.formatDate(IDCUtils.parseDate(value),"yyyy-MM-dd HH:mm:ss"); } vas+="cast('"+str+"' as datetime)"; - + } } } } if(!StringUtils.isEmpty(ins)&&!StringUtils.isEmpty(vas)) { sql = "("+ins+") values ("+vas+")"; - } - + } + return sql; } - - - + + + public static String convertColumnType(String dataType,String dbType,String width) { String columnType = dataType.toLowerCase(); if(dbType.contains("oracle.")) { columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar2" +width) : ("varchar2(" +width+")") : - columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") : + columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") : columnType.contains("date")||columnType.contains("time") ? "date" : columnType.contains("int")||columnType.contains("num")||columnType.contains("dec") ? width.contains("(") ? ("number"+width+"") : ("number("+width+")") : ""; } else { columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar" +width) : ("varchar(" +width+")") : - columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") : + columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") : columnType.contains("date")||columnType.contains("time") ? "datetime" : columnType.contains("int")||columnType.contains("num")||columnType.contains("dec") ? width !=null && width.contains(",") ? width.contains("(") ? ("decimal"+width+"") : ("decimal("+width+")") : "int" : ""; } - + return columnType; } private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210"; @@ -343,7 +343,7 @@ public class DBAUtils { } return result; } - + public static String tableJoinWhere(String tableName,Map columns) { String result = ""; if(tableName.contains(",")) { @@ -353,10 +353,10 @@ public class DBAUtils { //result = mTname+".id="+sTname+"."+mTname+"_id"; } return result; - + } - - + + /*从update语句解析select*/ public static String updateSqlToSelectSql(String sql,Map map) { String aSql = sql.toLowerCase(); @@ -386,7 +386,7 @@ public class DBAUtils { } return result; } - + public static String escape(String str) { String value = str; if(value!=null&&value.contains("'")) { @@ -395,6 +395,6 @@ public class DBAUtils { } return value; } - - + + } diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrErpOrderResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrErpOrderResponse.java index 04d560c1a..3b14e5cf3 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrErpOrderResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrErpOrderResponse.java @@ -5,7 +5,7 @@ import lombok.Data; import java.math.BigDecimal; @Data -public class ThrErpOrderResponse { +public class ThrErpOrderResponse { private long id; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java index 48da2b62f..ca4195a68 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java @@ -16,9 +16,8 @@ public class ThrOrderResponse { private String billType; private String billFlag; private String originType; - private String locStorageCode; - private String invWarehouseCode;//当前分库 - private String fromSubInvCode; //往来分库 + private String invCode; + private String fromInvCode; //往来仓库 private String thirdSysFk; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java index 92a74d7fd..dfdfd6dd0 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java @@ -8,7 +8,7 @@ import java.util.Date; @Data public class ThrUnitMaintainResponse { - private Integer id; + private Long id; private String erpId; @NotBlank(message = "往来单位名称不能为空！") diff --git a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java index fb4431d22..ac3f5d5ed 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.basic; -import cn.hutool.core.util.IdUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.UdiProductEntity; @@ -117,7 +116,7 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); } udiRelevanceEntity1.setThirdId(invmandocResponse.getCode()); - String time = DateUtil.getDateTime(); + String time = MsDateUtil.getDateTime(); udiRelevanceEntity1.setUpdateTime(new Date()); udiRelevanceEntity.setModifyTime(new Date()); udiRelevanceEntity.setIsDisable(false); diff --git a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java index 5dc88a603..2dbeafe7b 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java @@ -35,7 +35,7 @@ public interface BasicCorpService { boolean isExit(); - boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse); + boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse); List batchSelectByIds(List id); diff --git a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java index 773aaf062..2f22d2148 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java @@ -16,7 +16,7 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.HttpClient; import com.glxp.api.util.udi.FilterUdiUtils; @@ -76,7 +76,7 @@ public class BasicUpdateProductService { udiProductEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); udiProductService.insertUdiInfo(udiProductEntity); udiRelevanceEntity1.setUuid(udiProductEntity.getUuid()); - String time = DateUtil.getDateTime(); + String time = MsDateUtil.getDateTime(); udiRelevanceEntity1.setUpdateTime(new Date()); udiRelevanceEntity1.setModifyTime(new Date()); ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys(); diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 4dd036867..5238a4b8a 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -15,7 +15,6 @@ import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.udi.UdiInfoUtil; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index 50e57fc33..040db77bc 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -38,7 +38,7 @@ public class BasicCorpServiceImpl implements BasicCorpService { } @Override - public boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse) { + public boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse) { thrUnitMaintainResponse.setUpdateTime(new Date()); return basicCorpDao.insertThrUnitMaintainignore(thrUnitMaintainResponse); } @@ -50,21 +50,21 @@ public class BasicCorpServiceImpl implements BasicCorpService { @Override public boolean insert(BasicCorpEntity basicUnitMaintainEntity) { - return basicCorpDao.insert(basicUnitMaintainEntity)>0?true:false; + return basicCorpDao.insert(basicUnitMaintainEntity) > 0 ? true : false; } @Override public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) { basicUnitMaintainSaveRequest.setUpdateTime(new Date()); - return basicCorpDao.customUpdateById(basicUnitMaintainSaveRequest)>0?true:false; + return basicCorpDao.customUpdateById(basicUnitMaintainSaveRequest) > 0 ? true : false; } @Override public boolean updateByErpId(BasicCorpEntity basicCorpEntity) { basicCorpEntity.setUpdateTime(new Date()); - QueryWrapper ew=new QueryWrapper<>(); - ew.eq("erpId",basicCorpEntity.getErpId()); - return basicCorpDao.update(basicCorpEntity,ew)>0?true:false; + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("erpId", basicCorpEntity.getErpId()); + return basicCorpDao.update(basicCorpEntity, ew) > 0 ? true : false; } @Override diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java index 9016441ea..0700853e5 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java @@ -26,7 +26,7 @@ import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrDataService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.HttpClient; import org.springframework.beans.BeanUtils; @@ -254,7 +254,7 @@ public class BasicProductsImportLogServiceImpl implements BasicProductsImportLog public void updateValue(UdiRelevanceEntity udiRelevanceEntity, BasicProductsImportDetailEntity basicProductsImportDetailEntity, BasicProductsImportLogEntity basicProductsImportLogEntity, String mainId) { - String time = DateUtil.getDateTime(); + String time = MsDateUtil.getDateTime(); udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setModifyTime(new Date()); if (basicProductsImportDetailEntity.getIsUseDy() != null && !basicProductsImportDetailEntity.getIsUseDy().trim().equals("")) { diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 56aabade6..31a7d4d34 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; @@ -30,7 +29,7 @@ import com.glxp.api.service.basic.UdiRlSupService; import com.glxp.api.service.inv.InvProductDetailService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; @@ -442,7 +441,7 @@ public class IoAddInoutService { codeEnttity.setInvCode(orderEntity.getInvCode()); codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode())); codeEnttity.setUpdateTime(new Date()); - codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate())); + codeEnttity.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate())); ioCodeEnttities.add(codeEnttity); } codeTempService.insertBatch(ioCodeEnttities); @@ -481,7 +480,7 @@ public class IoAddInoutService { if (pdaCodeEntities != null && pdaCodeEntities.size() > 0) { PdaCodeEntity pdaCodeEntity = pdaCodeEntities.get(0); if (pdaCodeEntity.getActDate() != null) { - orderSaveRequest.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate())); + orderSaveRequest.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate())); } //写入条码 List ioCodeEnttities = new ArrayList<>(); @@ -495,7 +494,7 @@ public class IoAddInoutService { codeEnttity.setInvCode(orderSaveRequest.getInvCode()); codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode())); codeEnttity.setUpdateTime(new Date()); - codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate())); + codeEnttity.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate())); ioCodeEnttities.add(codeEnttity); } codeTempService.insertBatch(ioCodeEnttities); diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 5f110535a..0b53b51f4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -12,15 +12,13 @@ import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.InvProductDetailEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inv.InvProductDetailService; -import com.glxp.api.service.inv.InvProductService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import org.springframework.beans.BeanUtils; @@ -186,7 +184,7 @@ public class IoChangeInoutService { outOrder.setId(null); outOrder.setSupplementNo(null);//补单需置空 if (bussinessChangeTypeEntity.getBeforeTime() != null) - outOrder.setCreateTime(DateUtil.getBeforeDay(DateUtil.fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime())); + outOrder.setCreateTime(MsDateUtil.getBeforeDay(MsDateUtil.fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime())); else outOrder.setCreateTime(new Date()); //不设，默认为当前时间 outOrder.setAction(targetBustypeEntity.getAction()); diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index 7247a3507..cc5289f6a 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -1,29 +1,15 @@ package com.glxp.api.service.inout; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; -import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBusTypePreEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.inout.IoCodeEntity; -import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.*; -import com.glxp.api.entity.system.SystemParamConfigEntity; -import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBusTypePreService; -import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inv.*; -import com.glxp.api.service.system.SystemParamConfigService; -import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; -import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.OrderNoTypeBean; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 8f83f0ed5..f1f702b0f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -43,7 +43,7 @@ import com.glxp.api.service.inout.*; import com.glxp.api.service.inv.*; import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.service.thrsys.ThrOrderUploadBustypesService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; @@ -770,8 +770,8 @@ public class IoOrderServiceImpl implements IoOrderService { public void updateOrderInfo(OrderEditRequest orderEditRequest) { log.info("批量更新单据信息，参数列表： {}", JSONUtil.toJsonStr(orderEditRequest)); IoOrderEntity order = new IoOrderEntity(); - order.setCreateTime(DateUtil.parseDate(orderEditRequest.getCreateTime())); - order.setAuditTime(DateUtil.parseDate(orderEditRequest.getAuditTime())); + order.setCreateTime(MsDateUtil.parseDate(orderEditRequest.getCreateTime())); + order.setAuditTime(MsDateUtil.parseDate(orderEditRequest.getAuditTime())); order.setUpdateTime(new Date()); orderDao.update(order, new QueryWrapper().in("billNo", orderEditRequest.getOrderIds())); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index efa21c420..f61c87117 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -4,28 +4,22 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.dao.inv.InvPreInProductDetailDao; -import com.glxp.api.dao.inv.InvPreProductDetailDao; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.entity.inv.InvPreinDetailEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPreProductDetailResponse; import com.glxp.api.service.auth.InvSpaceService; -import com.glxp.api.service.inv.InvPreProductDetailService; import com.glxp.api.service.inv.InvPreinProductDetailService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -158,7 +152,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe //设置单据日期 IoOrderEntity order = orderDao.selectOne(new QueryWrapper().select("createTime").eq("billNo", response.getOrderId())); if (order != null) - response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + response.setOrderTime(MsDateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); } @Override diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java index 065b7fb13..16a9b8399 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.dao.basic.UdiProductDao; @@ -13,17 +12,14 @@ import com.glxp.api.dao.inv.InvPreProductDetailDao; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.inv.InvPreInProductDetailEntity; import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; -import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPreProductDetailResponse; import com.glxp.api.service.auth.InvSpaceService; import com.glxp.api.service.inv.InvPreProductDetailService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -152,7 +148,7 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic //设置单据日期 IoOrderEntity order = orderDao.selectOne(new QueryWrapper().select("createTime").eq("billNo", response.getOrderId())); if (order != null) - response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + response.setOrderTime(MsDateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); } @Override diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java index 5b98c8d34..fe43bd0ad 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantType; -import com.glxp.api.dao.auth.InvSpaceDao; import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.inout.IoOrderDao; @@ -19,7 +18,7 @@ import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvProductDetailResponse; import com.glxp.api.service.auth.InvSpaceService; import com.glxp.api.service.inv.InvProductDetailService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.IntUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -172,7 +171,7 @@ public class InvProductDetailServiceImpl implements InvProductDetailService { //设置单据日期 IoOrderEntity order = orderDao.selectOne(new QueryWrapper().select("createTime").eq("billNo", response.getOrderId())); if (order != null) - response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + response.setOrderTime(MsDateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java index b08931609..a92e387fb 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java @@ -18,7 +18,7 @@ import com.glxp.api.entity.inv.InvRemindSetEntity; import com.glxp.api.req.inv.FilterInvRemindMsgRequest; import com.glxp.api.res.inv.InvRemindMsgResponse; import com.glxp.api.service.inv.InvRemindMsgService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -139,7 +139,7 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService { invRemindMsgRequest.setType("4"); //库存过期预警 InvRemindMsgEntity msgEntity = getInvRemindMsgEntity(invRemindMsgRequest, invProductEntity); //判断是否需要生成/刷新库存预警 - if ((null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() <= new Date().getTime()) && StrUtil.isNotBlank(invProductEntity.getExpireDate()) && DateUtil.compareExpire(invProductEntity.getExpireDate(), null)) { + if ((null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() <= new Date().getTime()) && StrUtil.isNotBlank(invProductEntity.getExpireDate()) && MsDateUtil.compareExpire(invProductEntity.getExpireDate(), null)) { //设置预警消息 msgEntity.setMsg(StrUtil.format("产品已过期，产品失效日期：{}", invProductEntity.getExpireDate())); saveMsg(msgEntity); @@ -179,13 +179,13 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService { Date updateTime = msgEntity.getUpdateTime(); switch (ignoreStatus) { case 1: //忽略7天 - msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 7 * 24)); + msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 7 * 24)); break; case 2: //忽略15天 - msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 15 * 24)); + msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 15 * 24)); break; case 3: //忽略30天 - msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 30 * 24)); + msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 30 * 24)); break; default: break; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java index 927e65a66..d70f1c005 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java @@ -13,7 +13,7 @@ import com.glxp.api.entity.purchase.SupCertRemindMsgEntity; import com.glxp.api.req.purchase.FilterCertRemindMsgRequest; import com.glxp.api.res.purchase.SupCertRemindMsgResponse; import com.glxp.api.service.purchase.SupCertRemindMsgService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -88,13 +88,13 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService { Date updateTime = msgEntity.getUpdateTime(); switch (ignoreStatus) { case 1: //忽略7天 - msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 7 * 24)); + msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 7 * 24)); break; case 2: //忽略15天 - msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 15 * 24)); + msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 15 * 24)); break; case 3: //忽略30天 - msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 30 * 24)); + msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 30 * 24)); break; default: break; @@ -192,15 +192,15 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService { switch (type) { case 1: //供应商 idFk = supCertEntity.getCustomerId(); - msg = "供应商资质过期，过期时间：" + DateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd"); + msg = "供应商资质过期，过期时间：" + MsDateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd"); break; case 2: //生产企业 idFk = supCertEntity.getManufacturerIdFk(); - msg = "生产企业资质过期，过期时间：" + DateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd"); + msg = "生产企业资质过期，过期时间：" + MsDateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd"); break; case 3: //产品 idFk = supCertEntity.getProductIdFk(); - msg = "产品资质过期，过期时间：" + DateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd"); + msg = "产品资质过期，过期时间：" + MsDateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd"); break; default: break; diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 7c48920d4..e25752254 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -32,7 +32,6 @@ import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.idc.service.FileService; import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.res.inv.InnerOrderPrintResponse; import com.glxp.api.res.sync.*; import com.glxp.api.service.auth.*; import com.glxp.api.service.basic.*; @@ -40,7 +39,7 @@ import com.glxp.api.service.inout.*; import com.glxp.api.service.system.*; import com.glxp.api.service.thrsys.*; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.JsonUtils; import com.glxp.api.util.RedisUtil; import lombok.RequiredArgsConstructor; @@ -52,7 +51,6 @@ import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -140,7 +138,7 @@ public class HeartService { basicExportStatusEntity1 = orderStatusEntity; } BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SCAN_ORDER); spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId()); spsSyncOrderResponse.setType(NEW_ALL_ORDER); @@ -206,7 +204,7 @@ public class HeartService { basicExportStatusEntity1 = orderStatusEntity; } BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_ORDER); spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId()); spsSyncOrderResponse.setType(BasicProcessStatus.ALL_BUS_ORDER); @@ -515,7 +513,7 @@ public class HeartService { private String writeFile(String filePath, String fileDesc, String content) throws IOException { - filePath = String.format("%s/%s", filePath, DateUtil.getDate()); + filePath = String.format("%s/%s", filePath, MsDateUtil.getDate()); String fileFullPath = String.format("%s/%s-%s.udi", filePath, fileDesc, IdUtil.fastSimpleUUID()); File file = new File(filePath); if (!file.exists()) { @@ -523,7 +521,7 @@ public class HeartService { } file = new File(fileFullPath); while (!file.createNewFile()) { - fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, DateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID()); + fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, MsDateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID()); file = new File(fileFullPath); } @@ -1148,7 +1146,7 @@ public class HeartService { if (timeInfo == null) { timeInfo = BasicExportStatusTimeEntity.builder() .key(exportStatusTimeEnum.getKey()) - .lastUpdateTime(DateUtil.formatDateTime(date)) + .lastUpdateTime(MsDateUtil.formatDateTime(date)) .remark(exportStatusTimeEnum.getRemark()) .build(); basicExportTimeService.save(timeInfo); @@ -1157,7 +1155,7 @@ public class HeartService { isNew = false; } basicExportTimeService.update(Wrappers.lambdaUpdate(BasicExportStatusTimeEntity.class) - .set(BasicExportStatusTimeEntity::getLastUpdateTime, DateUtil.formatDateTime(date)) + .set(BasicExportStatusTimeEntity::getLastUpdateTime, MsDateUtil.formatDateTime(date)) .eq(BasicExportStatusTimeEntity::getKey, exportStatusTimeEnum.getKey()) ); } @@ -1202,7 +1200,7 @@ public class HeartService { basicExportStatusEntity2 = busTypetatusEntity; } BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_TYPE); spsSyncBusResponse.setTaskId(basicExportStatusEntity2.getId()); BaseResponse baseResponse2 = spGetHttp.postAllBusType(spsSyncBusResponse); @@ -1263,7 +1261,7 @@ public class HeartService { } BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BASIC_DATA); syncDataResponse.setTaskId(basicExportStatusEntity3.getId()); BaseResponse baseResponse = spGetHttp.postAllUser(syncDataResponse); @@ -2047,7 +2045,7 @@ public class HeartService { } BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_DATA); spsSyncThrDataResponse.setTaskId(basicExportStatusEntity1.getId()); BaseResponse baseResponse = spGetHttp.postThrData(spsSyncThrDataResponse); @@ -2116,7 +2114,7 @@ public class HeartService { } BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SYS_SETTING); spsSyncSysSettingResponse.setTaskId(basicExportStatusEntity1.getId()); spsSyncSysSettingResponse.setType(basicExportStatusEntity1.getType()); @@ -2194,7 +2192,7 @@ public class HeartService { } BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_PRODUCTS); spsSyncThrProductsResponse.setTaskId(basicExportStatusEntity1.getId()); BaseResponse baseResponse = spGetHttp.postThrProducts(spsSyncThrProductsResponse); diff --git a/src/main/java/com/glxp/api/service/sync/UpBasicService.java b/src/main/java/com/glxp/api/service/sync/UpBasicService.java index 4e1003ecd..67c5179ab 100644 --- a/src/main/java/com/glxp/api/service/sync/UpBasicService.java +++ b/src/main/java/com/glxp/api/service/sync/UpBasicService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.sync; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; @@ -28,7 +27,7 @@ import com.glxp.api.service.purchase.PurOrderDetailService; import com.glxp.api.service.purchase.PurOrderService; import com.glxp.api.service.system.*; import com.glxp.api.service.thrsys.IThrBusTypeOriginService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -90,7 +89,7 @@ public class UpBasicService { BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) { for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) { - List temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); if (CollUtil.isNotEmpty(temps)) { orderEntities.addAll(temps); } @@ -153,7 +152,7 @@ public class UpBasicService { if (CollUtil.isNotEmpty(syncDataSetEntity.getChangeBusTypes())) { for (SyncDataChangeBustypesEntity syncDataChangeBustypesEntity : syncDataSetEntity.getChangeBusTypes()) { if (syncDataChangeBustypesEntity.getAction().equals(ConstantStatus.BUS_ORDER_CGDD)) { - List temps = purOrderService.findByStatus(syncDataChangeBustypesEntity.getAction(), syncDataChangeBustypesEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List temps = purOrderService.findByStatus(syncDataChangeBustypesEntity.getAction(), syncDataChangeBustypesEntity.getOrderStatus(), MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); if (CollUtil.isNotEmpty(temps)) { purOrderEntities.addAll(temps); } @@ -189,19 +188,19 @@ public class UpBasicService { //扫码单据类型 if (syncDataSetEntity.getTypeScan() == 1) { - List bussinessTypeEntities = basicBussinessTypeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List bussinessTypeEntities = basicBussinessTypeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities); } // 业务单据类型 if (syncDataSetEntity.getTypeBus() == 1) { - List basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncBusResponse.setBusTypeChangeEntities(basicBusTypeChangeEntities); } //第三方单据类型 if (syncDataSetEntity.getTypeThird() == 1) { - List thrBusTypeOriginEntities = thrBusTypeOriginService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List thrBusTypeOriginEntities = thrBusTypeOriginService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncBusResponse.setThrBusTypeOriginEntities(thrBusTypeOriginEntities); } @@ -251,7 +250,7 @@ public class UpBasicService { if (syncDataSetEntity.getBasicInv() == 1) { //仓库字典 - List invWarehouseEntities = invWarehouseService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List invWarehouseEntities = invWarehouseService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); syncDataResponse.setInvWarehouseEntities(invWarehouseEntities); if (CollUtil.isNotEmpty(invWarehouseEntities)) { @@ -309,24 +308,24 @@ public class UpBasicService { //系统运行参数 if (syncDataSet.getSystemConfig() == 1) { - List systemParamConfigEntities = systemParamConfigService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List systemParamConfigEntities = systemParamConfigService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncSysSettingResponse.setSystemParamConfigEntities(systemParamConfigEntities); } //委托验收设置 if (syncDataSet.getEntrustAction() == 1) { - List entrustReceEntities = entrustReceService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List entrustReceEntities = entrustReceService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncSysSettingResponse.setEntrustReceEntities(entrustReceEntities); } //打印设置 if (syncDataSet.getPrintConfig() == 1) { - List systemPDFModuleEntities = systemPDFModuleService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List systemPDFTemplateEntities = systemPDFTemplateService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List systemPDFModuleEntities = systemPDFModuleService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List systemPDFTemplateEntities = systemPDFTemplateService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncSysSettingResponse.setSystemPDFModuleEntities(systemPDFModuleEntities); spsSyncSysSettingResponse.setSystemPDFTemplateEntities(systemPDFTemplateEntities); @@ -338,13 +337,13 @@ public class UpBasicService { //自动建出入库单 if (syncDataSet.getScanChangeConfig() == 1) { - List basicBusTypePreEntities = basicBusTypePreService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List basicBusTypePreEntities = basicBusTypePreService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncSysSettingResponse.setBasicBusTypePreEntities(basicBusTypePreEntities); } //自动建业务单设置 if (syncDataSet.getBusChangeConfig() == 1) { - List basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncSysSettingResponse.setBasicBusTypeChangeEntities(basicBusTypeChangeEntities); } diff --git a/src/main/java/com/glxp/api/service/sync/UpThrDataService.java b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java index 89356bfcf..d7b7658d4 100644 --- a/src/main/java/com/glxp/api/service/sync/UpThrDataService.java +++ b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java @@ -12,7 +12,7 @@ import com.glxp.api.service.thrsys.ThrCorpService; import com.glxp.api.service.thrsys.ThrDeptService; import com.glxp.api.service.thrsys.ThrInvWarehouseService; import com.glxp.api.service.thrsys.ThrProductsService; -import com.glxp.api.util.DateUtil; +import com.glxp.api.util.MsDateUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -48,19 +48,19 @@ public class UpThrDataService { //第三方部门信息 if (syncDataSet.getBasicThirdDept() == 1) { - List deptEntities = thrDeptService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List deptEntities = thrDeptService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncThrDataResponse.setDeptEntities(deptEntities); } //第三方仓库信息 if (syncDataSet.getBasicThirdInv() == 1) { - List invWarehouseEntities = thrInvWarehouseService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List invWarehouseEntities = thrInvWarehouseService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncThrDataResponse.setInvWarehouseEntities(invWarehouseEntities); } //第三方往来单位信息 if (syncDataSet.getBasicThirdCorp() == 1) { - List corpEntities = thrCorpService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List corpEntities = thrCorpService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncThrDataResponse.setCorpEntities(corpEntities); } return spsSyncThrDataResponse; @@ -79,7 +79,7 @@ public class UpThrDataService { //第三方产品信息 if (syncDataSet.getBasicThirdProducts() == 1) { - List thrProductsEntities = thrProductsService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List thrProductsEntities = thrProductsService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); spsSyncThrProductsResponse.setProductsEntities(thrProductsEntities); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index abf80ecb5..16e42baac 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -58,6 +58,8 @@ public class ThrOrdersDlService { SyncDataSetService syncDataSetService; @Resource HttpOkClient httpOkClient; + @Resource + private IThrBusTypeOriginService iThrBusTypeOriginService; public String getIpUrl() { SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet(); @@ -69,22 +71,22 @@ public class ThrOrdersDlService { ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); - //todo单据还没设计好 -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(action, "orderQueryUrl"); -// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { -// WebSocketServer.sendInfo("业务单据查询接口未设置！", "sid"); -// return; -// } - ThrSystemDetailEntity thrSystemDetailEntity = new ThrSystemDetailEntity(); + ThrSystemDetailEntity thrSystemDetailEntity = iThrBusTypeOriginService.findSysByAction(action, "orderQueryUrl"); + if (thrSystemDetailEntity == null || !thrSystemDetailEntity.getEnabled()) { + WebSocketServer.sendInfo("业务单据查询接口未设置！", "sid"); + return; + } + if (thrSystemDetailEntity.getThirdSysFk() == null) { + WebSocketServer.sendInfo("业务单据查询接口未设置！", "sid"); + return; + } int page = 1; int limit = 100; while (page != -1) { - page = getOrders(page, limit, thrSystemDetailEntity.getValue(), thrSystemDetailEntity.getThirdSysFk(), thrOrderImportLogEntity, action, filterThrProductsRequest); + page = getOrders(page, limit, thrSystemDetailEntity.getThirdSysFk(), thrOrderImportLogEntity, action, filterThrProductsRequest); } - thrOrderImportLogService.importThrOrder(genKey); - redisUtil.set(Constant.dlThrProducts, "false"); WebSocketServer.sendInfo("业务单据信息下载已完成，请刷新查看！", "sid"); thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); @@ -96,20 +98,28 @@ public class ThrOrdersDlService { ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); if (erpOrderResponses != null && erpOrderResponses.size() > 0) { for (ThrOrderResponse erpOrderResponse : erpOrderResponses) { - List thrOrderDetailEntities = new ArrayList<>(); + ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); + BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); + thrOrderEntity.setThirdSysFk(thirdSys); + ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); + if (originEntity != null) { + thrOrderService.deleteById(originEntity.getId() + ""); + thrOrderDetailService.deleteByOrderIdFk(originEntity.getId() + ""); + } + thrOrderService.insertThrOrder(thrOrderEntity); + List thrOrderDetailEntities = new ArrayList<>(); for (ThrOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { - ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity(); + ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); + thrOrderDetailEntity.setUpdateTime(new Date()); BeanUtils.copyProperties(subPurchase, thrOrderDetailEntity); - BeanUtils.copyProperties(erpOrderResponse, thrOrderDetailEntity); - thrOrderDetailEntity.setGenKeyFk(thrOrderImportLogEntity.getGenKey()); thrOrderDetailEntity.setThirdSysFk(thirdSys); thrOrderDetailEntity.setUpdateTime(new Date()); + thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getBillNo()); thrOrderDetailEntities.add(thrOrderDetailEntity); } - thrOrderImportDetailService.insertOrderImportDetails(thrOrderDetailEntities); + thrOrderDetailService.insertThrOrderDetails(thrOrderDetailEntities); } } - thrOrderImportLogService.importThrOrder(genKey); redisUtil.set(Constant.dlThrProducts, "false"); WebSocketServer.sendInfo("业务单据信息下载已完成，请刷新查看！", "sid"); thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); @@ -216,209 +226,7 @@ public class ThrOrdersDlService { thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); } - // -// -// @Async -// public void genJsonFile(String genKey, ThrOrderExportRequest thrOrderExportRequest) { -// ThrOrderExportJsonResponse thrOrderExportJsonResponse = new ThrOrderExportJsonResponse(); -// ThrOrderExportLogEntity thrOrderExportLogEntity = thrOrderExportLogService.selectByGenKey(genKey); -// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderExportRequest.getBillAction()); -// List erpOrderResponses = thrOrderExportRequest.getErpOrderResponses(); -// //选中导出 -// if (thrOrderExportRequest.getErpOrderResponses() != null && thrOrderExportRequest.getErpOrderResponses().size() > 0) { -// BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); -// bussinessTypeFilterRequest.setEnabled(true); -// if (erpOrderResponses != null && erpOrderResponses.size() > 0) { -// List thrOrderEntities = new ArrayList<>(); -// List thrOrderDetailEntities = new ArrayList<>(); -// for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { -// ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); -// BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); -// thrOrderEntities.add(thrOrderEntity); -// if (erpOrderResponse.getSubErpOrders() != null && erpOrderResponse.getSubErpOrders().size() > 0) { -// for (ErpOrderResponse.SubErpOrder subErpOrder : erpOrderResponse.getSubErpOrders()) { -// ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); -// BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity); -// thrOrderDetailEntities.add(thrOrderDetailEntity); -// } -// } -// } -// thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities); -// thrOrderExportJsonResponse.setThrOrderDetailEntities(thrOrderDetailEntities); -// } -// } else {//一键导出 -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", bussinessTypeEntity.getThirdSysFk()); -// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrOrderExportLogEntity.setRemark("业务单据接口地址未定义"); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// return; -// } -// if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrOrderExportLogEntity.setRemark("第三方系统业务单据接口服务未启用"); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// return; -// } -// if (basicThirdSysDetailEntity.getFromType() == 0) { -// FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); -// filterThrOrderRequest.setThirdSysFk(bussinessTypeEntity.getThirdSysFk()); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); -// erpOrderResponses = getThrOrders(filterThrOrderRequest); -// if (erpOrderResponses != null && erpOrderResponses.size() > 0) { -// List thrOrderEntities = new ArrayList<>(); -// List thrOrderDetailEntities = new ArrayList<>(); -// for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { -// ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); -// BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); -// thrOrderEntities.add(thrOrderEntity); -// if (erpOrderResponse.getSubErpOrders() != null && erpOrderResponse.getSubErpOrders().size() > 0) { -// for (ErpOrderResponse.SubErpOrder subErpOrder : erpOrderResponse.getSubErpOrders()) { -// ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); -// BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity); -// thrOrderDetailEntities.add(thrOrderDetailEntity); -// } -// } -// } -// thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities); -// thrOrderExportJsonResponse.setThrOrderDetailEntities(thrOrderDetailEntities); -// } -// } else { -// FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); -// List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); -// List results = new ArrayList<>(); -// for (ThrOrderEntity thrOrderEntity : thrOrderEntities) { -// FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); -// filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); -// List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); -// if (thrOrderDetailEntities != null) { -// results.addAll(thrOrderDetailEntities); -// } -// -// } -// -// thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities); -// thrOrderExportJsonResponse.setThrOrderDetailEntities(results); -// } -// -// } -// FileWriter writer = new FileWriter(thrOrderExportLogEntity.getFilePath()); -// writer.write(JSONUtil.toJsonStr(thrOrderExportJsonResponse)); -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// } -// -// -// @Async -// public void uploadSpssync(String genKey, ThrOrderExportRequest thrOrderExportRequest) { -// -// ThrOrderExportJsonResponse thrOrderExportJsonResponse = new ThrOrderExportJsonResponse(); -// ThrOrderExportLogEntity thrOrderExportLogEntity = thrOrderExportLogService.selectByGenKey(genKey); -// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderExportRequest.getBillAction()); -// List erpOrderResponses = thrOrderExportRequest.getErpOrderResponses(); -// //选中导出 -// if (thrOrderExportRequest.getErpOrderResponses() != null && thrOrderExportRequest.getErpOrderResponses().size() > 0) { -// BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); -// bussinessTypeFilterRequest.setEnabled(true); -// if (erpOrderResponses != null && erpOrderResponses.size() > 0) { -// List thrOrderEntities = new ArrayList<>(); -// List thrOrderDetailEntities = new ArrayList<>(); -// for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { -// ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); -// BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); -// thrOrderEntities.add(thrOrderEntity); -// if (erpOrderResponse.getSubErpOrders() != null && erpOrderResponse.getSubErpOrders().size() > 0) { -// for (ErpOrderResponse.SubErpOrder subErpOrder : erpOrderResponse.getSubErpOrders()) { -// ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); -// BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity); -// thrOrderDetailEntities.add(thrOrderDetailEntity); -// } -// } -// } -// thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities); -// thrOrderExportJsonResponse.setThrOrderDetailEntities(thrOrderDetailEntities); -// } -// } else {//一键导出 -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", bussinessTypeEntity.getThirdSysFk()); -// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrOrderExportLogEntity.setRemark("业务单据接口地址未定义"); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// return; -// } -// if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrOrderExportLogEntity.setRemark("第三方系统业务单据接口服务未启用"); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// return; -// } -// if (basicThirdSysDetailEntity.getFromType() == 0) { -// FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); -// filterThrOrderRequest.setThirdSysFk(bussinessTypeEntity.getThirdSysFk()); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); -// erpOrderResponses = getThrOrders(filterThrOrderRequest); -// if (erpOrderResponses != null && erpOrderResponses.size() > 0) { -// List thrOrderEntities = new ArrayList<>(); -// List thrOrderDetailEntities = new ArrayList<>(); -// for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { -// ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); -// BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); -// thrOrderEntities.add(thrOrderEntity); -// if (erpOrderResponse.getSubErpOrders() != null && erpOrderResponse.getSubErpOrders().size() > 0) { -// for (ErpOrderResponse.SubErpOrder subErpOrder : erpOrderResponse.getSubErpOrders()) { -// ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); -// BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity); -// thrOrderDetailEntities.add(thrOrderDetailEntity); -// } -// } -// } -// thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities); -// thrOrderExportJsonResponse.setThrOrderDetailEntities(thrOrderDetailEntities); -// } -// } else { -// FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); -// List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); -// List results = new ArrayList<>(); -// for (ThrOrderEntity thrOrderEntity : thrOrderEntities) { -// FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); -// filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); -// List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); -// if (thrOrderDetailEntities != null) { -// results.addAll(thrOrderDetailEntities); -// } -// -// } -// -// thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities); -// thrOrderExportJsonResponse.setThrOrderDetailEntities(results); -// } -// -// } -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// String response = httpOkClient.uCloudPost(getIpUrl() + "/spssync/thirdsys/order/upload", thrOrderExportJsonResponse); -// BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { -// }); -// if (baseResponse.getCode() == 20000) { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// } else { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// } -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// } -// -// public String getName(List bussinessTypeEntities, String action) { -// for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { -// if (bussinessTypeEntity.getAction().equals(action)) { -// return bussinessTypeEntity.getName(); -// } -// } -// return action; -// } -// + @Async public void uploadSmp(String genKey, ThrOrderExportRequest thrOrderExportRequest) { @@ -497,7 +305,7 @@ public class ThrOrdersDlService { } - public int getOrders(int page, int limit, String orderUrl, String thirdSys, ThrOrderImportLogEntity + public int getOrders(int page, int limit, String thirdSys, ThrOrderImportLogEntity thrOrderImportLogEntity, String action, FilterThrOrderRequest filterThrOrderRequest) { if (filterThrOrderRequest == null) filterThrOrderRequest = new FilterThrOrderRequest(); @@ -513,21 +321,24 @@ public class ThrOrdersDlService { for (ThrOrderResponse erpOrderResponse : erpOrderResponses) { ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); - thrOrderEntity.setThirdSysFk(thirdSys); + ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); + if (originEntity != null) { + thrOrderService.deleteById(originEntity.getId() + ""); + thrOrderDetailService.deleteByOrderIdFk(originEntity.getId() + ""); + } thrOrderEntity.setUpdateTime(new Date()); + thrOrderEntity.setThirdSysFk(thirdSys); thrOrderService.insertThrOrder(thrOrderEntity); -// thrOrderEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); - List thrOrderDetailEntities = new ArrayList<>(); + List thrOrderDetailEntities = new ArrayList<>(); for (ThrOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { - ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity(); + ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); BeanUtils.copyProperties(subPurchase, thrOrderDetailEntity); - BeanUtils.copyProperties(erpOrderResponse, thrOrderDetailEntity); - thrOrderDetailEntity.setGenKeyFk(thrOrderImportLogEntity.getGenKey()); thrOrderDetailEntity.setThirdSysFk(thirdSys); + thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getBillNo()); thrOrderDetailEntity.setUpdateTime(new Date()); thrOrderDetailEntities.add(thrOrderDetailEntity); } - thrOrderImportDetailService.insertOrderImportDetails(thrOrderDetailEntities); + thrOrderDetailService.insertThrOrderDetails(thrOrderDetailEntities); } page++; if (page * limit < responseBaseResponse.getData().getTotal()) { diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java b/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java index 0e81844ae..2aaf92845 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java @@ -1,8 +1,10 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.util.IdUtil; import cn.hutool.extra.pinyin.PinyinUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; @@ -42,7 +44,6 @@ public class ThrUnitImportService { List imports = new ArrayList<>(); if (thrSystemDetailEntity.getFromType() == 0) { int page = 1; - List erpUnitsResponses = new ArrayList<>(); while (true) { unitMaintainFilterRequest.setPage(page); @@ -58,43 +59,33 @@ public class ThrUnitImportService { erpUnitsResponses.addAll(temps); } } - imports.addAll(erpUnitsResponses); - } else { FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); filterThrCorpRequest.setPage(null); List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); -// List lists = thrCorpEntities.stream().map( -// item -> { -// ThrCorpsResponse thrProductsEntity = new ThrCorpsResponse(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// thrProductsEntity.setId(item.getUnitId()); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); imports.addAll(thrCorpEntities); } if (imports != null && imports.size() > 0) { for (ThrCorpsResponse erpUnitsResponse : imports) { - ThrUnitMaintainResponse thrUnitMaintainResponse = new ThrUnitMaintainResponse(); + BasicCorpEntity thrUnitMaintainResponse = new BasicCorpEntity(); if (unitMaintainFilterRequest.getThirdSys() != null) { if ("thirdId".equals(unitMaintainFilterRequest.getThirdSys())) { - thrUnitMaintainResponse.setThirdId(erpUnitsResponse.getId()); + thrUnitMaintainResponse.setThirdId(erpUnitsResponse.getUnitId()); thrUnitMaintainResponse.setThirdName(erpUnitsResponse.getName()); } else if ("thirdId1".equals(unitMaintainFilterRequest.getThirdSys())) { - thrUnitMaintainResponse.setThirdId1(erpUnitsResponse.getId()); + thrUnitMaintainResponse.setThirdId1(erpUnitsResponse.getUnitId()); thrUnitMaintainResponse.setThirdName1(erpUnitsResponse.getName()); } else if ("thirdId2".equals(unitMaintainFilterRequest.getThirdSys())) { - thrUnitMaintainResponse.setThirdId2(erpUnitsResponse.getId()); + thrUnitMaintainResponse.setThirdId2(erpUnitsResponse.getUnitId()); thrUnitMaintainResponse.setThirdName2(erpUnitsResponse.getName()); } else if ("thirdId3".equals(unitMaintainFilterRequest.getThirdSys())) { - thrUnitMaintainResponse.setThirdId3(erpUnitsResponse.getId()); + thrUnitMaintainResponse.setThirdId3(erpUnitsResponse.getUnitId()); thrUnitMaintainResponse.setThirdName3(erpUnitsResponse.getName()); } else if ("thirdId4".equals(unitMaintainFilterRequest.getThirdSys())) { - thrUnitMaintainResponse.setThirdId4(erpUnitsResponse.getId()); + thrUnitMaintainResponse.setThirdId4(erpUnitsResponse.getUnitId()); thrUnitMaintainResponse.setThirdName4(erpUnitsResponse.getName()); } } @@ -111,6 +102,7 @@ public class ThrUnitImportService { thrUnitMaintainResponse.setContact(erpUnitsResponse.getContact()); thrUnitMaintainResponse.setMobile(erpUnitsResponse.getMobile()); thrUnitMaintainResponse.setUpdateTime(new Date()); + thrUnitMaintainResponse.setId(IdUtil.getSnowflakeNextId()); basicCorpService.insertThrUnitMaintainignore(thrUnitMaintainResponse); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 21f80135c..22c2b3de9 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -220,7 +220,7 @@ public class ThrProductsServiceImpl extends ServiceImpl 月 -> 季度 -> 年度 汇总数据 ThreadUtil.execAsync(() -> { log.info("开始生成每日物资出入库汇总数据"); @@ -88,7 +88,7 @@ public class IoStatOrderTask implements SchedulingConfigurer { statYearService.statData(today); log.info("年度物资出入库汇总数据生成结束"); }); - } else if (DateUtil.isQuarterStart(today)) { + } else if (MsDateUtil.isQuarterStart(today)) { //季度第一天，依次生成 日 -> 月 -> 季度 汇总数据 ThreadUtil.execAsync(() -> { log.info("开始生成每日物资出入库汇总数据"); @@ -103,7 +103,7 @@ public class IoStatOrderTask implements SchedulingConfigurer { statQuarterService.statData(today); log.info("季度物资出入库汇总数据生成结束"); }); - } else if (DateUtil.isMonthStart(today)) { + } else if (MsDateUtil.isMonthStart(today)) { //月度第一天，依次生成 日 -> 月 汇总数据 ThreadUtil.execAsync(() -> { log.info("开始生成每日物资出入库汇总数据"); diff --git a/src/main/java/com/glxp/api/util/DateUtil.java b/src/main/java/com/glxp/api/util/MsDateUtil.java similarity index 97% rename from src/main/java/com/glxp/api/util/DateUtil.java rename to src/main/java/com/glxp/api/util/MsDateUtil.java index d0122a17b..f932151a5 100644 --- a/src/main/java/com/glxp/api/util/DateUtil.java +++ b/src/main/java/com/glxp/api/util/MsDateUtil.java @@ -15,7 +15,7 @@ import java.text.SimpleDateFormat; import java.util.*; @Slf4j -public class DateUtil extends DateUtils { +public class MsDateUtil extends DateUtils { private static String[] parsePatterns = { "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM", @@ -69,7 +69,7 @@ public class DateUtil extends DateUtils { public static String formateExpireTime(String str) { try { - Date date = DateUtil.parseDate(str, "yyyyMMdd"); + Date date = MsDateUtil.parseDate(str, "yyyyMMdd"); return formatDate(date, "yyyy-MM-dd"); } catch (ParseException e) { e.printStackTrace(); @@ -79,7 +79,7 @@ public class DateUtil extends DateUtils { public static Long parseDateExpire(String str) { try { - return DateUtil.parseDate(str, "yyyyMMdd").getTime(); + return MsDateUtil.parseDate(str, "yyyyMMdd").getTime(); } catch (ParseException e) { e.printStackTrace(); } @@ -102,6 +102,11 @@ public class DateUtil extends DateUtils { return FastDateFormat.getInstance(pattern).format(new Date()); } + public static String getDiFormat(String originDate) { + Date date = parseDate(originDate); + return FastDateFormat.getInstance("yyMMdd").format(date); + } + /** * 得到当前日期前后多少天，月，年的日期字符串 * @@ -564,7 +569,7 @@ public class DateUtil extends DateUtils { public static String formatExpireTime(String str) { try { - Date date = DateUtil.parseDate(str, "yyyyMMdd"); + Date date = MsDateUtil.parseDate(str, "yyyyMMdd"); return formatDate(date, "yyyy-MM-dd"); } catch (ParseException e) { e.printStackTrace(); @@ -614,7 +619,7 @@ public class DateUtil extends DateUtils { */ public static boolean compareExpire(String expireDate, String time) { if (StrUtil.isBlank(time)) { - time = DateUtil.getDate("yyMMdd"); + time = MsDateUtil.getDate("yyMMdd"); } long t1 = Long.parseLong(expireDate); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bfbb93cff..788a2796b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test + active: dev jmx: enabled: false servlet: diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 37dd870b1..9639dd6d1 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -30,7 +30,7 @@ AND corpType = #{corpType} - + AND corpType in #{item} @@ -111,16 +111,16 @@ #{remark}) - + insert ignore INTO basic_corp - (thirdId, erpId, name, spell, + (id, thirdId, erpId, name, spell, addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType, createUser, createTime, updateUser, remark) - values (#{thirdId}, + values (#{id}, #{thirdId}, #{erpId}, #{name}, #{spell}, diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index 2d4bd7738..7fb4dea5e 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -6,7 +6,7 @@ resultType="com.glxp.api.entity.thrsys.ThrOrderEntity"> SELECT thr_order.*, thr_bustype_origin.name billTypeName FROM thr_order - LEFT JOIN thr_bustype_origin ON thr_order.billType = thr_bustype_origin.action + LEFT JOIN thr_bustype_origin ON thr_order.billType = thr_bustype_origin.action AND billNo = #{billNo} @@ -48,23 +48,20 @@ replace - INTO thr_order - (id, billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName, - invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address, - linkMan, linkTel, remark) + INTO thr_order + (id, billFlag, billNo, billdate, billType, corpId, corpName, inoutType, deptCode, + invCode, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address, + linkMan, linkTel, remark) values (#{id}, #{billFlag}, #{billNo}, #{billdate}, #{billType}, - #{billTypeName}, #{corpId}, #{corpName}, #{inoutType}, #{deptCode}, - #{deptName}, #{invCode}, - #{invName}, #{thirdSysFk}, #{createUser}, #{createTime}, @@ -80,23 +77,20 @@ replace - INTO thr_order - (id, billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName, - invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address, - linkMan, linkTel, remark) + INTO thr_order + (id, billFlag, billNo, billdate, billType, corpId, corpName, inoutType, deptCode, + invCode, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address, + linkMan, linkTel, remark) values (#{id}, #{billFlag}, #{billNo}, #{billdate}, #{billType}, - #{billTypeName}, #{corpId}, #{corpName}, #{inoutType}, #{deptCode}, - #{deptName}, #{invCode}, - #{invName}, #{thirdSysFk}, #{createUser}, #{createTime}, @@ -112,24 +106,22 @@ replace INTO thr_order - (billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName, - invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address, - linkMan, linkTel, remark) - values + (billFlag, billNo, billdate, billType, corpId, corpName, inoutType, deptCode, + invCode, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, + address, + linkMan, linkTel, remark) + values (#{item.billFlag}, #{item.billNo}, #{item.billdate}, #{item.billType}, - #{item.billTypeName}, #{item.corpId}, #{item.corpName}, #{item.inoutType}, #{item.deptCode}, - #{item.deptName}, #{item.invCode}, - #{item.invName}, #{item.thirdSysFk}, #{item.createUser}, #{item.createTime}, From 950301315da985e3204fc00f0ef407f56489eb8f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 19 Jun 2023 15:07:21 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E6=A0=B8=E5=AF=B9=E4=BA=BA=EF=BC=8C=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=BC=96=E8=BE=91=E4=BF=A1=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 2 +- .../controller/inout/IoOrderController.java | 14 +++++----- .../api/entity/basic/UdiProductEntity.java | 26 ------------------- .../service/inout/IoCheckInoutService.java | 8 ++++-- 4 files changed, 14 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index ece1b278a..7abcef388 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -375,7 +375,7 @@ public class IoCodeTempController extends BaseController { if (udiInfoEntity == null) { return ResultVOUtils.error(500, "耗材字典不存在此产品！"); } - if (!udiInfoEntity.getAllowNoBatch()) { + if (!IntUtil.value(udiInfoEntity.getAllowNoBatch())) { if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { return ResultVOUtils.error(500, "序列号与批次号不能同时为空！"); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 6c8132534..41aaa7365 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -247,7 +247,7 @@ public class IoOrderController extends BaseController { return tempResponse; //todo 目前先去掉因为不能改变状态 有问题可以看一下这个方法 // if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE){ - ioAddInoutService.dealProcess(orderEntity); + ioAddInoutService.dealProcess(orderEntity); // } @@ -359,7 +359,7 @@ public class IoOrderController extends BaseController { public BaseResponse checkSubmitEnable(IoOrderEntity orderEntity) { - if(orderEntity==null){ + if (orderEntity == null) { return ResultVOUtils.error(500, "提交失败，请先添加物资！"); } @@ -735,7 +735,7 @@ public class IoOrderController extends BaseController { @PostMapping("/udiwms/stock/order/change") public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) { - + AuthAdmin authAdmin = getUser(); IoOrderEntity originOrder = orderService.findByBillNo(addOrderChangeRequest.getOrderId()); IoOrderEntity newOrder = new IoOrderEntity(); List originCodes = codeService.findByOrderId(originOrder.getBillNo()); @@ -748,7 +748,8 @@ public class IoOrderController extends BaseController { newOrder.setFromDeptCode(fromInv.getParentId()); } - + newOrder.setCreateUser(authAdmin.getId() + ""); + newOrder.setUpdateUser(authAdmin.getId() + ""); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderChangeRequest.getInvCode()); newOrder.setInvCode(addOrderChangeRequest.getInvCode()); newOrder.setDeptCode(invWarehouseEntity.getParentId()); @@ -829,8 +830,8 @@ public class IoOrderController extends BaseController { return ResultVOUtils.success(); } - @GetMapping ("/udiwms/inout/order/getUserBean") - public BaseResponse getUserBean(){ + @GetMapping("/udiwms/inout/order/getUserBean") + public BaseResponse getUserBean() { AuthAdmin userBean = customerService.getUserBean(); @@ -838,5 +839,4 @@ public class IoOrderController extends BaseController { } - } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 11e5a3176..c1893bd26 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -96,30 +96,4 @@ public class UdiProductEntity { private String categoryName; private Date updateTime; - - public Boolean getAllowNoBatch() { - if (allowNoBatch == null) - return false; - return allowNoBatch; - } - - public Boolean getAllowNoExpire() { - if (allowNoExpire == null) - return false; - return allowNoExpire; - } - - public Boolean getAllowNoProduct() { - if (allowNoProduct == null) - return false; - return allowNoProduct; - } - - public Boolean getAllowNoSerial() { - if (allowNoSerial == null) - return false; - return allowNoSerial; - } - - } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 7b97a2176..69bb21bc2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -329,7 +329,6 @@ public class IoCheckInoutService { codeService.insert(codeEnttity); } codeTempService.deleteByBillNo(orderEntity.getBillNo()); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS); orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); orderEntity.setUpdateTime(new Date()); @@ -748,7 +747,9 @@ public class IoCheckInoutService { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW); } } - + if (StrUtil.isEmpty(orderEntity.getCheckUser())) { + orderEntity.setCheckUser(orderEntity.getCreateUser()); + } if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW); orderEntity.setUpdateTime(new Date()); @@ -810,6 +811,9 @@ public class IoCheckInoutService { orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK); orderEntity.setUpdateTime(new Date()); orderEntity.setAuditTime(new Date()); + if (StrUtil.isEmpty(orderEntity.getReviewUser())) { + orderEntity.setReviewUser(orderEntity.getReviewUser()); + } orderService.update(orderEntity); genInv(orderEntity, bussinessTypeEntity); } From 134762db9e3d5e255cc2678a0e6e32f4d9607943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 19 Jun 2023 17:55:47 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/res/inout/IoUploadOrderResponse.java | 2 +- .../inout/impl/PlatformServiceImpl.java | 54 ++++++++++--------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/glxp/api/res/inout/IoUploadOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoUploadOrderResponse.java index a9849c649..a70c445a0 100644 --- a/src/main/java/com/glxp/api/res/inout/IoUploadOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoUploadOrderResponse.java @@ -9,7 +9,7 @@ import java.util.List; public class IoUploadOrderResponse { private List ioOrderDetailCodeEntityList; - private List ioCodeTempEntityList; + private List ioCodeEntityList; private IoOrderEntity ioOrderEntity; private PlatformLinkResponse platformLinkRespons; private List ioOrderDetailBizEntityList; diff --git a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java index 8a91ab2ad..685f2402f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.net.URLEncodeUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; @@ -35,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.File; import java.io.IOException; +import java.net.URLEncoder; import java.util.*; import java.util.concurrent.TimeUnit; @@ -61,6 +63,8 @@ public class PlatformServiceImpl implements PlatformService { IoOrderDetailResultDao ioOrderDetailResultDao; @Resource IoOrderInvoiceMapper ioOrderInvoiceMapper; + @Resource + IoCodeService ioCodeService; @Value("${file_path}") private String filePath; @Value("${API_KEY}") @@ -318,52 +322,50 @@ public class PlatformServiceImpl implements PlatformService { return ResultVOUtils.error(999, "该单据不存在!"); } //查询客户关联信息 - PlatformLinkResponse platformLinkRespons = unitMaintainPlatformDao.selectByUnitld(ioOrderEntity.getFromCorp(),ioOrderEntity.getAction()); - if(platformLinkRespons == null){ + PlatformLinkResponse platformLinkRespons = unitMaintainPlatformDao.selectByUnitld(ioOrderEntity.getFromCorp(), ioOrderEntity.getAction()); + if (platformLinkRespons == null) { return ResultVOUtils.error(999, "该单没有设置补单条件!"); } //获取单据详情 - List ioOrderDetailCodeEntityList=ioOrderDetailCodeService.findByOrderId(orderId); - List ioCodeTempEntityList = ioCodeTempService.findByOrderId(orderId); - for (IoCodeTempEntity ioCodeTempEntity : ioCodeTempEntityList) { - Map jsonMap = new HashMap<>(); - jsonMap.put("code", ioCodeTempEntity.getCode()); - ObjectMapper mapper = new ObjectMapper(); - String json = mapper.writeValueAsString(jsonMap); - ioCodeTempEntity.setCode(json); + List ioOrderDetailCodeEntityList = ioOrderDetailCodeService.findByOrderId(orderId); + List ioCodeEntityList = ioCodeService.findByOrderId(orderId); + for (IoCodeEntity ioCodeTempEntity : ioCodeEntityList) { + String code = URLEncodeUtil.encode(ioCodeTempEntity.getCode()); + ioCodeTempEntity.setCode(code); } + //获取业务单 - QueryWrapper ew=new QueryWrapper<>(); - ew.eq("orderIdFk",orderId); - List ioOrderDetailBizEntityList=ioOrderDetailBizDao.selectList(ew); + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("orderIdFk", orderId); + List ioOrderDetailBizEntityList = ioOrderDetailBizDao.selectList(ew); //获取结果单 - QueryWrapper ew1=new QueryWrapper<>(); - ew1.eq("orderIdFk",orderId); - List ioOrderDetailResultEntityList=ioOrderDetailResultDao.selectList(ew1); + QueryWrapper ew1 = new QueryWrapper<>(); + ew1.eq("orderIdFk", orderId); + List ioOrderDetailResultEntityList = ioOrderDetailResultDao.selectList(ew1); //获取发票 - QueryWrapper ew2=new QueryWrapper<>(); - ew2.eq("orderIdFk",orderId); - List ioOrderInvoiceEntityList=ioOrderInvoiceMapper.selectList(ew2); - ArrayList list=new ArrayList<>(); + QueryWrapper ew2 = new QueryWrapper<>(); + ew2.eq("orderIdFk", orderId); + List ioOrderInvoiceEntityList = ioOrderInvoiceMapper.selectList(ew2); + ArrayList list = new ArrayList<>(); for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) { - if(StrUtil.isNotBlank(ioOrderInvoiceEntity.getLicenseUrl())){ + if (StrUtil.isNotBlank(ioOrderInvoiceEntity.getLicenseUrl())) { list.add(filePath + "/register/image2/" + ioOrderInvoiceEntity.getLicenseUrl()); ioOrderInvoiceEntity.setLicenseUrl("as" + ioOrderInvoiceEntity.getLicenseUrl()); } } //没有图片的时候不用上传 - if(list.size()>0){ - relayFile(list,platformLinkRespons.getHost()); + if (list.size() > 0) { + relayFile(list, platformLinkRespons.getHost()); } //组装数据 String host = platformLinkRespons.getHost(); - IoUploadOrderResponse ioUploadOrderResponse=new IoUploadOrderResponse(); + IoUploadOrderResponse ioUploadOrderResponse = new IoUploadOrderResponse(); ioUploadOrderResponse.setIoOrderEntity(ioOrderEntity); ioUploadOrderResponse.setPlatformLinkRespons(platformLinkRespons); - ioUploadOrderResponse.setIoCodeTempEntityList(ioCodeTempEntityList); + ioUploadOrderResponse.setIoCodeEntityList(ioCodeEntityList); ioUploadOrderResponse.setIoOrderDetailCodeEntityList(ioOrderDetailCodeEntityList); ioUploadOrderResponse.setIoOrderDetailResultEntityList(ioOrderDetailResultEntityList); ioUploadOrderResponse.setIoOrderDetailBizEntityList(ioOrderDetailBizEntityList); @@ -406,7 +408,7 @@ public class PlatformServiceImpl implements PlatformService { if (!StringUtils.isEmpty(files.get(i))) { File file = new File(files.get(i)); String fileName = files.get(i); - fileName = "as"+ fileName.substring(fileName.lastIndexOf("/")+1); + fileName = "as" + fileName.substring(fileName.lastIndexOf("/") + 1); builder.addFormDataPart("files", fileName, RequestBody.create(MediaType.parse(fileType), file)); } From f66705d82bcfe337fcc46b9e59146f7aec7e0e2a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 19 Jun 2023 18:28:01 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92?= =?UTF-8?q?=EF=BC=8C=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=AD=89=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 2 +- .../purchase/IoPurChangeService.java | 11 +- .../purchase/PurPlanController.java | 1 + .../com/glxp/api/dao/purchase/PurPlanDao.java | 10 +- .../api/entity/purchase/PurOrderEntity.java | 8 + .../api/entity/purchase/PurPlanEntity.java | 12 +- .../api/res/purchase/PurOrderResponse.java | 1 + .../api/res/purchase/PurPlanResponse.java | 2 + .../api/service/purchase/PurPlanService.java | 3 +- .../purchase/impl/PurPlanServiceImpl.java | 11 +- .../mybatis/mapper/purchase/PurOrderDao.xml | 2 + .../mybatis/mapper/purchase/PurPlanDao.xml | 142 +++++------------- src/main/resources/schemas/schema_v2.1.sql | 5 +- 13 files changed, 89 insertions(+), 121 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 63a484eb0..47338a854 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -114,7 +114,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterGroupBySpuse") public BaseResponse filterGroupBySpuse(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setUserId(getUserId()); +// filterInvWarehouseRequest.setUserId(getUserId()); List invSubWarehouseEntities = invWarehouseService.filterGroupBySpuse(filterInvWarehouseRequest); return ResultVOUtils.success(invSubWarehouseEntities); } diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 961d511c6..1a194f5c2 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -134,6 +134,9 @@ public class IoPurChangeService { purPlanEntity.setDeptCode(purApplyEntity.getTargetDeptCode()); purPlanEntity.setCreateUser(purApplyEntity.getAuditUser()); purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser()); + purPlanEntity.setApplyAuditUser(purApplyEntity.getAuditUser()); + purPlanEntity.setApplyInv(purApplyEntity.getInvCode()); + purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo()); purPlanEntity.setApplyRemark(purApplyEntity.getRemark()); if (basicBusTypeChangeEntity.getBusBeforeTime() != null) { purPlanEntity.setCreateTime(MsDateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); @@ -220,6 +223,8 @@ public class IoPurChangeService { purOrderEntity.setDeptCode(purPlanEntity.getDeptCode()); purOrderEntity.setApplyRemark(purPlanEntity.getApplyRemark()); purOrderEntity.setApplyCreateUser(purPlanEntity.getApplyCreateUser()); + purOrderEntity.setApplyAuditUser(purPlanEntity.getApplyAuditUser()); + purOrderEntity.setApplyInv(purPlanEntity.getApplyInv()); purOrderEntity.setCreateUser(purPlanEntity.getAuditUser()); purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser()); if (basicBusTypeChangeEntity.getBusBeforeTime() != null) { @@ -252,13 +257,9 @@ public class IoPurChangeService { // 更新计划表信息插入订单单号 PurPlanEntity purPlanEntity1 = new PurPlanEntity(); purPlanEntity1.setId(purPlanEntity.getId()); - purPlanEntity1.setStockOrderNo(billNos.substring(0)); -// purPlanEntity.sets(true); + purPlanEntity1.setStockOrderNo(billNos); purPlanService.update(purPlanEntity1); } -// if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { -// purPlanGen(purPlanEntity); -// } } } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index ae725cd77..e188e8fbc 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -187,6 +187,7 @@ public class PurPlanController { purPlanEntity.setStatus(postPurPlanRequest.getEditStatus()); purPlanService.update(purPlanEntity); if (purPlanEntity.getStatus() == 3) { + purPlanEntity = purPlanService.selectById(purPlanEntity.getId()); purChangeService.purPlanChange(purPlanEntity); // generateDocument(purPlanEntity); } diff --git a/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java index 6bfffbddb..fce1de01f 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java @@ -1,6 +1,8 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.purchase.PurOrderEntity; import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurPlanResponse; @@ -10,16 +12,10 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface PurPlanDao { +public interface PurPlanDao extends BaseMapperPlus { List queryPageList(PurPlanRequest purPlanRequest); - Boolean insert(PurPlanEntity purPlanRequest); - - Boolean update(PurPlanEntity purPlanRequest); - Boolean deleteByIds(@Param("ids") List ids); - Boolean deleteById(@Param("id") long id); - } diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java index 573a981c9..77fe55250 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java @@ -111,6 +111,13 @@ public class PurOrderEntity { @TableField(value = "applyAuditUser") private String applyAuditUser; + /** + * 申购仓库 + */ + @TableField(value = "applyInv") + private String applyInv; + + /** * 申购说明 */ @@ -141,6 +148,7 @@ public class PurOrderEntity { @TableField(value = "arrivalTime") private Date arrivalTime; + public static final String COL_ID = "id"; public static final String COL_BILLNO = "billNo"; diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java index f654c95f6..094320736 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java @@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import lombok.Data; @Data @TableName(value = "pur_plan") public class PurPlanEntity { - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -103,6 +105,12 @@ public class PurPlanEntity { @TableField(value = "applyCreateUser") private String applyCreateUser; + /** + * 申购仓库 + */ + @TableField(value = "applyInv") + private String applyInv; + /** * 申购审核人 */ @@ -175,4 +183,4 @@ public class PurPlanEntity { public static final String COL_APPLYBILLNO = "applyBillNo"; public static final String COL_STOCKORDERNO = "stockOrderNo"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java index 01be33715..c6002e99d 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java @@ -63,6 +63,7 @@ public class PurOrderResponse { private String applyAuditBy; //申购审核人 private String applyRemark; //申购说明 private String applyBillNo; //申购单据号，多单以逗号隔开 + private String applyInvName; private String stockOrderNo; diff --git a/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java b/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java index 708104a7c..4c66a90a0 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.res.purchase; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; @@ -61,6 +62,7 @@ public class PurPlanResponse { private String applyCreateBy; //申购人 private String applyAuditBy; //申购审核人 + private String applyInvName; private String applyRemark; //申购说明 private String applyBillNo; //申购单据号，多单以逗号隔开 diff --git a/src/main/java/com/glxp/api/service/purchase/PurPlanService.java b/src/main/java/com/glxp/api/service/purchase/PurPlanService.java index 8a1bd186c..b36c60723 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurPlanService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurPlanService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.purchase; - import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurPlanResponse; @@ -21,5 +20,7 @@ public interface PurPlanService { Boolean deleteById(long id); + PurPlanEntity selectById(Long id); + } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java index 8bf8efb60..ed3cfbf6d 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java @@ -35,12 +35,12 @@ public class PurPlanServiceImpl implements PurPlanService { @Override public Boolean insert(PurPlanEntity purPlanRequest) { - return purPlanDao.insert(purPlanRequest); + return purPlanDao.insert(purPlanRequest) > 0; } @Override public Boolean update(PurPlanEntity purPlanRequest) { - return purPlanDao.update(purPlanRequest); + return purPlanDao.updateById(purPlanRequest) > 0; } @Override @@ -50,6 +50,11 @@ public class PurPlanServiceImpl implements PurPlanService { @Override public Boolean deleteById(long id) { - return purPlanDao.deleteById(id); + return purPlanDao.deleteById(id) > 0; + } + + @Override + public PurPlanEntity selectById(Long id) { + return purPlanDao.selectById(id); } } diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml index f42d35738..b8dc44954 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml @@ -40,6 +40,7 @@ ab.employeeName auditUserName, db.employeeName applyCreateBy, auth_warehouse.NAME invName, + aw1.name applyInvName, auth_dept.`name` deptName, basic_corp.name supName FROM pur_order @@ -49,6 +50,7 @@ LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code` LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode left join basic_corp on pur_order.supId = basic_corp.erpId + left join auth_warehouse aw1 on pur_order.applyInv = aw1.`code` AND billNo = #{billNo} diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index b2d2d3148..f53b2c97a 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -2,49 +2,57 @@ - - - replace - INTO pur_plan - ( - billNo,billDate,status,billType,remark,invCode, - deptCode,createUser,createTime,auditUser,auditTime,updateTime,auditRemark - ,applyCreateUser,applyAuditUser,applyRemark,applyBillNo,stockOrderNo,emergency,arrivalTime - ) - values ( - #{billNo}, - #{billDate}, - #{status}, - #{billType}, - #{remark}, - #{invCode}, - #{deptCode}, - #{createUser}, - #{createTime}, - #{auditUser}, - #{auditTime}, - #{updateTime}, - #{auditRemark}, - #{applyCreateUser}, - #{applyAuditUser}, - #{applyRemark}, - #{applyBillNo}, - #{stockOrderNo}, - #{emergency},#{arrivalTime} - ) - - - DELETE FROM pur_plan WHERE id in + DELETE + FROM pur_plan WHERE id in #{item} - - - - - - UPDATE pur_plan - - billNo=#{billNo}, - billDate=#{billDate}, - status=#{status}, - billType=#{billType}, - remark=#{remark}, - invCode=#{invCode}, - deptCode=#{deptCode}, - auditUser=#{auditUser}, - auditTime=#{auditTime}, - createUser=#{createUser}, - createTime=#{createTime}, - updateTime=#{updateTime}, - updateUser=#{updateUser}, - auditRemark=#{auditRemark}, - applyCreateUser=#{applyCreateUser}, - applyAuditUser=#{applyAuditUser}, - applyRemark=#{applyRemark}, - applyBillNo=#{applyBillNo}, - stockOrderNo=#{stockOrderNo}, - emergency=#{emergency}, - arrivalTime=#{arrivalTime}, - - WHERE id = #{id} - - - - DELETE FROM pur_plan - WHERE id = #{id} - - diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 04db04b5b..c035ec697 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -134,6 +134,9 @@ CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('pur_order', 'dealStatus', 'int', 1); +CALL Pro_Temp_ColumnWork('pur_plan', 'applyInv', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('pur_order', 'applyInv', 'varchar(255)', 1); + INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1); @@ -491,7 +494,7 @@ CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'topInvCode', 'varchar(255)', CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'topInvSpaceCode', 'varchar(255)', 1); -call Modify_index('basic_products','uuid','idx_uuid','BTREE'); +call Modify_index('basic_products', 'uuid', 'idx_uuid', 'BTREE'); CALL Pro_Temp_ColumnWork('basic_products', 'sfwblztlcp', 'varchar(255)', 1); From fce5d7b7c61cd32882ab22f61406037fad3455a9 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 19 Jun 2023 21:53:09 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=AD=89=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 1 - .../purchase/IoPurChangeService.java | 8 +- .../purchase/PurApplyController.java | 16 +- .../purchase/PurOrderController.java | 5 +- .../purchase/PurOrderReceiveController.java | 4 +- .../purchase/PurPlanController.java | 4 +- .../java/com/glxp/api/task/SyncHeartTask.java | 4 +- .../mybatis/mapper/purchase/PurApplyDao.xml | 202 +++++++++++------- src/main/resources/schemas/schema_v2.1.sql | 5 + 9 files changed, 150 insertions(+), 99 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 47338a854..8404d3fcf 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -114,7 +114,6 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterGroupBySpuse") public BaseResponse filterGroupBySpuse(FilterInvWarehouseRequest filterInvWarehouseRequest) { -// filterInvWarehouseRequest.setUserId(getUserId()); List invSubWarehouseEntities = invWarehouseService.filterGroupBySpuse(filterInvWarehouseRequest); return ResultVOUtils.success(invSubWarehouseEntities); } diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 1a194f5c2..3c4e758a9 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -122,7 +122,7 @@ public class IoPurChangeService { PurPlanEntity purPlanEntity = new PurPlanEntity(); List purPlanDetailEntityList = new ArrayList<>(); if (purApplyEntity.getStatus() == 3) { - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG"); + basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG); if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd"))); purPlanEntity.setBillDate(purApplyEntity.getBillDate()); @@ -131,6 +131,7 @@ public class IoPurChangeService { purPlanEntity.setEmergency(purApplyEntity.getEmergency()); purPlanEntity.setArrivalTime(purApplyEntity.getArrivalTime()); purPlanEntity.setInvCode(purApplyEntity.getTargetInvCode()); + purPlanEntity.setBillType(ConstantStatus.BUS_ORDER_CGJH); purPlanEntity.setDeptCode(purApplyEntity.getTargetDeptCode()); purPlanEntity.setCreateUser(purApplyEntity.getAuditUser()); purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser()); @@ -202,7 +203,7 @@ public class IoPurChangeService { //根据供应商分组 Map> purPlanDetailMap = purPlanDetailEntityList1.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId)); purPlanDetailMap.put("not", purPlanDetailEntityList2); - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH"); + basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH); if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { for (String key : purPlanDetailMap.keySet()) { PurOrderEntity purOrderEntity = new PurOrderEntity(); @@ -227,6 +228,7 @@ public class IoPurChangeService { purOrderEntity.setApplyInv(purPlanEntity.getApplyInv()); purOrderEntity.setCreateUser(purPlanEntity.getAuditUser()); purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser()); + purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD); if (basicBusTypeChangeEntity.getBusBeforeTime() != null) { purOrderEntity.setCreateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime())); purOrderEntity.setUpdateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime())); @@ -420,7 +422,7 @@ public class IoPurChangeService { //采购计划生成扫码单据 public void purPlanGen(PurPlanEntity purPlanEntity) { BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity(); - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH"); + basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH); List purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + ""); //对计划单里面的供应商进行分组 Map> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId)); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 3be1c0fef..140b32be1 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -90,6 +90,7 @@ public class PurApplyController { purApplyEntity.setCreateUser(userId + ""); purApplyEntity.setCreateTime(new Date()); purApplyEntity.setUpdateTime(new Date()); + purApplyEntity.setBillType(ConstantStatus.BUS_ORDER_CPSG); purApplyEntity.setStatus(postPurApplyRequest.getEditStatus()); //草稿状态 if (postPurApplyRequest.getType() != null) { String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")); @@ -109,7 +110,7 @@ public class PurApplyController { * 查询申购单列表 */ @PostMapping("/purchase/apply/list") - public BaseResponse list(@RequestBody PurApplyRequest purApplyRequest) { + public BaseResponse list(@RequestBody PurApplyRequest purApplyRequest) { if (purApplyRequest.getStatus() == null) { purApplyRequest.setStatus(11); //查询未审核和草稿状态 @@ -130,12 +131,11 @@ public class PurApplyController { * 查询申购单列表 */ @PostMapping("/purchase/apply/auditList") - public BaseResponse auditList(@RequestBody PurApplyRequest purApplyRequest) { + public BaseResponse auditList(@RequestBody PurApplyRequest purApplyRequest) { if (purApplyRequest.getStatus() == null) { purApplyRequest.setStatus(10); //查询未审核和已审核状态 } - List purApplyEntities = purApplyService.queryPageList(purApplyRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(purApplyEntities); @@ -214,7 +214,7 @@ public class PurApplyController { PurPlanEntity purPlanEntity = new PurPlanEntity(); List purPlanDetailEntityList = new ArrayList<>(); if (purApplyEntity.getStatus() == 3) { - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG"); + basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG); if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd"))); purPlanEntity.setBillDate(purApplyEntity.getBillDate()); @@ -255,7 +255,7 @@ public class PurApplyController { //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\ PurOrderEntity purOrderEntity = new PurOrderEntity(); if (purPlanEntity.getStatus() == 3) { - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH"); + basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH); if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"))); purOrderEntity.setBillDate(purApplyEntity.getBillDate()); @@ -477,15 +477,15 @@ public class PurApplyController { */ @RepeatSubmit() @PostMapping("/purchase/apply/addDetail") - public BaseResponse addDetail(@RequestBody List list) { + public BaseResponse addDetail(@RequestBody List list) { - if(list.size()!=0) { + if (list.size() != 0) { for (PurApplyDetailEntity purApplyDetailEntity : list) { purApplyDetailService.insert(purApplyDetailEntity); } return ResultVOUtils.success(list.get(0).getOrderIdFk()); } - return ResultVOUtils.error(555,"请选择数据!"); + return ResultVOUtils.error(555, "请选择数据!"); } /** diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 2e30da22a..456407e07 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -9,6 +9,7 @@ import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.entity.purchase.*; @@ -80,13 +81,13 @@ public class PurOrderController { Long userId = customerService.getUserId(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); - Long id=purOrderEntity.getId(); + Long id = purOrderEntity.getId(); purOrderEntity.setCreateUser(userId + ""); purOrderEntity.setCreateTime(new Date()); purOrderEntity.setUpdateTime(new Date()); purOrderEntity.setUpdateUser(userId + ""); purOrderEntity.setStatus(postPurOrderRequest.getEditStatus()); //草稿状态 - + purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD); if (postPurOrderRequest.getType() != null) { String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")); purOrderEntity.setBillNo(billNo); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 0b52be99c..af5efd3af 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -309,7 +309,7 @@ public class PurOrderReceiveController extends BaseController { PurPlanEntity purPlanEntity = new PurPlanEntity(); List purPlanDetailEntityList = new ArrayList<>(); if (purApplyEntity.getStatus() == 3) { - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG"); + basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG); if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd"))); purPlanEntity.setBillDate(purReceiveEntity.getBillDate()); @@ -349,7 +349,7 @@ public class PurOrderReceiveController extends BaseController { //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\ PurOrderEntity purOrderEntity = new PurOrderEntity(); if (purPlanEntity.getStatus() == 3) { - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH"); + basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH); if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"))); purOrderEntity.setBillDate(purReceiveEntity.getBillDate()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index e188e8fbc..b497be27e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -94,7 +94,7 @@ public class PurPlanController { purPlanEntity.setUpdateTime(new Date()); purPlanEntity.setUpdateUser(userId + ""); purPlanEntity.setStatus(postPurPlanRequest.getEditStatus()); //草稿状态 - + purPlanEntity.setBillType(ConstantStatus.BUS_ORDER_CGJH); if (postPurPlanRequest.getType() != null) { String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")); purPlanEntity.setBillNo(billNo); @@ -262,7 +262,7 @@ public class PurPlanController { //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\ PurOrderEntity purOrderEntity = new PurOrderEntity(); if (purPlanEntity.getStatus() == 3) { - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH"); + basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH); if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"))); purOrderEntity.setBillDate(purPlanEntity.getBillDate()); diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 61fdbc44a..2dcc0989d 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -21,8 +21,8 @@ import javax.annotation.Resource; import java.util.Arrays; -//@Component -//@EnableScheduling +@Component +@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class); diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index e809b244e..663cccb5d 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -2,45 +2,54 @@ - @@ -152,6 +140,7 @@