From c16b975862c7b8ebd2e4301fa4cd86ea856cb7c0 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 3 Mar 2022 17:59:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=A0=E9=99=A4=EF=BC=8C=E5=86=85=E9=83=A8?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=80=89=E6=8B=A9=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BussinessLocalTypeController.java | 24 +++++++++++++++---- .../basic/BussinessTypeController.java | 11 +++++---- .../controller/inout/WareHouseController.java | 12 ++++------ .../basic/BussinessLocalTypeEntity.java | 2 ++ .../entity/basic/BussinessTypeEntity.java | 1 + .../BussinessLocalTypeFilterRequest.java | 1 + .../req/basic/BussinessTypeFilterRequest.java | 1 + .../admin/res/basic/BussinessTypResponse.java | 3 ++- .../thread/BasicUdiInfoImportService.java | 2 +- .../mapper/basic/BussinessLocalTypeDao.xml | 7 ++++-- .../mybatis/mapper/basic/BussinessTypeDao.xml | 19 ++++++++++----- 11 files changed, 56 insertions(+), 27 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java index bd4eb45..b07dab7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java @@ -9,6 +9,7 @@ import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; import com.glxp.sale.admin.res.PageSimpleResponse; @@ -55,6 +56,11 @@ public class BussinessLocalTypeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + String customerId = getCustomerId(); + if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) { + bussinessTypeFilterRequest.setSpUse(true); + } + List bussinessTypeEntities; bussinessTypeEntities = bussinessLocalTypeService.filterJoin( bussinessTypeFilterRequest); @@ -112,11 +118,19 @@ public class BussinessLocalTypeController { } String id = deleteRequest.getId(); BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.selectById(id); - StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); - stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction()); - StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); - if (stockOrderEntity != null) { - return ResultVOUtils.error(500, "已存在该类型码业务单据，无法删除！"); + + BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest(); + bussinessTypeFilterRequest.setAction(bussinessLocalTypeEntity.getAction()); + List bussinessLocalTypeEntities = bussinessLocalTypeService.filterJoin(bussinessTypeFilterRequest); + if (bussinessLocalTypeEntities != null && bussinessLocalTypeEntities.size() > 0) { + return ResultVOUtils.error(500, "该业务单据类型已被扫码单据类型绑定，无法删除！"); + }else{ + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction()); + StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); + if (stockOrderEntity != null) { + return ResultVOUtils.error(500, "已存在该类型业务单据，无法删除！"); + } } BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findFirstByAction(bussinessLocalTypeEntity.getAction()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index ded8950..c132cb6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -110,11 +110,12 @@ public class BussinessTypeController { if (orderEntity != null) { return ResultVOUtils.error(500, "已存在该类型扫码单据，无法删除！"); } - - BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction()); - if (bussinessLocalTypeEntity != null && !"".equals(bussinessLocalTypeEntity)) { - return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型，无法删除！"); - } +// if (bussinessTypeEntity.getLocalAction() != null && !bussinessTypeEntity.getLocalAction().equals("")) { +// BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction()); +// if (bussinessLocalTypeEntity != null && !"".equals(bussinessLocalTypeEntity)) { +// return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型，无法删除！"); +// } +// } bussinessTypeService.deleteById(id); return ResultVOUtils.success("删除成功"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index f1e0389..5d7f57d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -253,9 +253,9 @@ public class WareHouseController { if (udiEntity == null) return ResultVOUtils.error(500, "UDI码格式错误！"); String orderId = addOrderRequest.getOrderId(); - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(addOrderRequest.getCustomerId())); - addOrderRequest.setFromCorp(companyEntity.getCompanyName()); - addOrderRequest.setFromCorpId((companyEntity.getUnitIdFk())); +// CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(addOrderRequest.getCustomerId())); +// addOrderRequest.setFromCorp(companyEntity.getCompanyName()); +// addOrderRequest.setFromCorpId((companyEntity.getUnitIdFk())); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getBillType()); if (StringUtils.isBlank(orderId)) { orderId = System.currentTimeMillis() + new Random().nextInt(10) + ""; @@ -265,8 +265,6 @@ public class WareHouseController { orderSaveRequest.setActDate(addOrderRequest.getActDate()); } - orderSaveRequest.setFromCorpId(companyEntity.getUnitIdFk()); - orderSaveRequest.setFromCorp(companyEntity.getCompanyName()); orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction()); @@ -274,8 +272,8 @@ public class WareHouseController { orderSaveRequest.setActor(addOrderRequest.getActor()); orderSaveRequest.setCorpOrderId(addOrderRequest.getCorpOrderId()); orderSaveRequest.setLocStorageCode(addOrderRequest.getLocStorageCode()); -// orderSaveRequest.setFromCorpId(addOrderRequest.getFromCorpId()); -// orderSaveRequest.setFromCorp(addOrderRequest.getFromCorp()); + orderSaveRequest.setFromCorpId(addOrderRequest.getFromCorpId()); + orderSaveRequest.setFromCorp(addOrderRequest.getFromCorp()); orderSaveRequest.setFromType(ConstantStatus.FROM_WEBNEW); orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); orderSaveRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java index 0163bc0..86ca898 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java @@ -17,5 +17,7 @@ public class BussinessLocalTypeEntity { private Boolean advanceType; private Boolean changeEnable; private Boolean spUse; + private String storageCode; + private int corpType; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java index 02e4183..86f3b43 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java @@ -36,6 +36,7 @@ public class BussinessTypeEntity { private boolean secCheckChange; private int corpType; + private String storageCode; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java index bea3007..51a70f0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java @@ -13,5 +13,6 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest { private String originAction; private Boolean changeEnable; private Boolean spUse; + private Boolean isFilter; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java index 60fa9f4..6e2efa4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java @@ -14,5 +14,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest { private Boolean advanceType; private String type; private Boolean spUse; + private String localAction; private Boolean secCheckEnable; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java index f13ee53..c31ace3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java @@ -20,7 +20,7 @@ public class BussinessTypResponse { private Boolean advanceType; //是否预入库 private Boolean changeEnable; private Boolean genUnit; -// private Boolean innerOrder; + // private Boolean innerOrder; private Boolean spUse; private String localName; private Boolean secCheckEnable; @@ -40,4 +40,5 @@ public class BussinessTypResponse { private boolean secCheckWebNew; private boolean secCheckChange; private int corpType; + private String storageCode; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java index 7d76804..bc6d5b5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java @@ -204,7 +204,7 @@ public class BasicUdiInfoImportService { udiRelevanceEntity.setSptm(udiInfoImportDetailEntity.getSptm()); } - if (udiInfoImportDetailEntity.getIsUseDy() != null && udiInfoImportDetailEntity.getIsUseDy().trim().equals("")) { + if (udiInfoImportDetailEntity.getIsUseDy() != null && !udiInfoImportDetailEntity.getIsUseDy().trim().equals("")) { if (udiInfoImportDetailEntity.getIsUseDy().equals("是")) { udiRelevanceEntity.setIsUseDy(true); } else { diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 2f78871..92eabaf 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -29,10 +29,10 @@