From c3afd4b83ef6c1c056df88f583584be39c6b9b30 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 8 Mar 2022 17:03:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1modify=EF=BC=8C=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=AA=8C=E8=AF=81=EF=BC=8Cudims?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BussinessChangeTypeController.java | 4 +- .../basic/CorpExportLogController.java | 2 +- .../req/inout/PostUdimsOrderRequest.java | 6 +- .../admin/thread/IoTransInoutService.java | 118 +++++++++++++----- .../mybatis/mapper/auth/AuthLicenseDao.xml | 6 +- .../mybatis/mapper/info/ScheduleDao.xml | 23 ++-- 6 files changed, 113 insertions(+), 46 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java index 620e5c7..3b33d71 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java @@ -63,14 +63,14 @@ public class BussinessChangeTypeController { bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity(); - bussinessChangeTypeEntity1.setIntro("出库自动补\"采购入库单\""); + bussinessChangeTypeEntity1.setIntro("出库自动补\"入库单\""); bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN); bussinessChangeTypeEntity1.setIndex(1); bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity(); bussinessChangeTypeEntity2.setIntro("出库自动补\"寄售转入单\""); - bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN); + bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN); bussinessChangeTypeEntity2.setIndex(2); bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java index e7f18a5..3a129d9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java @@ -71,7 +71,7 @@ public class CorpExportLogController { } //往来单位excel文件下载 - //@AuthRuleAnnotation("") +// @AuthRuleAnnotation("") @GetMapping("/udiwms/corps/exportLog/download") public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java index 5ac171f..102493c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java @@ -12,8 +12,9 @@ public class PostUdimsOrderRequest { List orderBeans; private String customerId; + @Data public static class OrderBean { - private String id; + private String orderId; private String corpOrderId; private String action; private String actDate; @@ -22,9 +23,9 @@ public class PostUdimsOrderRequest { private String fromCorpId; private String fromCorp; private String remark; - private List codes; + @Data public static class CodeBean { private String action; private String mainAction; @@ -55,4 +56,5 @@ public class PostUdimsOrderRequest { } + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 3741e30..a128906 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -37,6 +37,7 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.thrsys.ThrDataService; import com.glxp.sale.admin.service.thrsys.ThrOrderService; import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.admin.util.FilterUdiUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -44,6 +45,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -171,8 +173,8 @@ public class IoTransInoutService { } WarehouseEntity warehouseEntity = warehouseEntityList.get(0); - String orderId = "SM"+ - System.currentTimeMillis() + i + ""; + String orderId = "SM" + + CustomUtil.getId() + i + ""; OrderEntity orderSaveRequest = new OrderEntity(); orderSaveRequest.setId(orderId); if (warehouseEntity.getActDate() != null) { @@ -219,6 +221,50 @@ public class IoTransInoutService { @Async public void createOrderUdims(PostUdimsOrderRequest postUdimsOrderRequest) { + CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(postUdimsOrderRequest.getCustomerId())); + List orderBeans = postUdimsOrderRequest.getOrderBeans(); + if (orderBeans != null) { + for (PostUdimsOrderRequest.OrderBean orderBean : orderBeans) { + + OrderEntity orderEntity = new OrderEntity(); + String orderId = "SM" + + CustomUtil.getId() + ""; + BeanUtils.copyProperties(orderBean, orderEntity); + orderEntity.setCorpOrderId(orderBean.getOrderId()); + orderEntity.setFromCorpId(companyEntity.getUnitIdFk()); + orderEntity.setFromCorp(companyEntity.getCompanyName()); + orderEntity.setFromType(ConstantStatus.FROM_UDIMS); + orderEntity.setReceiveStatus(0); + orderEntity.setId(orderId); + orderEntity.setAction(ConstantType.TYPE_PUT); + orderEntity.setAction("SC54593439742"); + orderEntity.setActDate(DateUtil.getDate()); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); + orderEntity.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); + orderEntity.setSignStatus(ConstantStatus.ORDER_SIGN_UN); + orderService.insertOrder(orderEntity); + List codeBeans = orderBean.getCodes(); + List warehouseEntities = new ArrayList<>(); + for (PostUdimsOrderRequest.OrderBean.CodeBean codeBean : codeBeans) { + WarehouseEntity warehouseEntity = new WarehouseEntity(); + BeanUtils.copyProperties(codeBean, warehouseEntity); + warehouseEntity.setFromCorp(companyEntity.getCompanyName()); + warehouseEntity.setFromCorpId(companyEntity.getUnitIdFk()); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true); + warehouseEntity.setLocStorageCode(invWarehouseEntity.getCode()); + warehouseEntity.setOrderId(orderId); + warehouseEntities.add(warehouseEntity); + } + for (WarehouseEntity temp : warehouseEntities) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(temp.getCode()); + temp.setNameCode(udiEntity.getUdi()); + } + + codesTempService.insertCodesTemp(warehouseEntities); + } + } + } @@ -244,13 +290,23 @@ public class IoTransInoutService { } public void transInout(OrderEntity orderEntity) { - + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); if (orderEntity.getFromCorp() == null) { orderEntity.setRemark("未选择往来单位"); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL); orderService.updateOrder(orderEntity); return; } else if (orderEntity.getFromCorpId() == null) { + + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) { + BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); + basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId()); + basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK); + basicUnitMaintainEntity.setName(orderEntity.getFromCorp()); + orderEntity.setFromCorpId(basicUnitMaintainEntity.getErpId()); + orderService.updateOrder(orderEntity); + basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + } BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(orderEntity.getFromCorp()); if (basicUnitMaintainEntity == null) { orderEntity.setRemark("未选择往来单位"); @@ -261,16 +317,6 @@ public class IoTransInoutService { orderEntity.setFromCorpId(basicUnitMaintainEntity.getErpId()); } } - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); - if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) { - BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); - basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId()); - basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK); - basicUnitMaintainEntity.setName(orderEntity.getFromCorp()); - orderEntity.setFromCorpId(basicUnitMaintainEntity.getErpId()); - orderService.updateOrder(orderEntity); - basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); - } // if (!Constant.SYSTEM_CUSTOMER_ID.equals(orderEntity.getFromCorpId())) { @@ -322,7 +368,7 @@ public class IoTransInoutService { orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品不允许以使用单元入库！"); return; } - if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(udiRelevanceResponse.getId() + "", warehouseEntity.getFromCorpId()); if (companyProductRelevanceEntity == null) { orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); @@ -371,27 +417,30 @@ public class IoTransInoutService { warehouseEntity.setStatus(0); if (warehouseEntity.getRelId() == null) warehouseEntity.setRelId(udiRelevanceEntities.get(0).getId() + ""); - if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { - String originSupId = checkOriginExitSup(warehouseEntity); - String supId = null; - if (originSupId == null) { - supId = checkExitSup(warehouseEntity.getRelId()); + String originSupId = checkOriginExitSup(warehouseEntity); + if (originSupId == null) { + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + String supId = null; + if (originSupId == null) { + supId = checkExitSup(warehouseEntity.getRelId()); + if (supId == null) { + supId = checkInvExitSup(warehouseEntity); + } + } else + supId = originSupId; + if (supId != null) {//&& !supId.equals("MUTI") + warehouseEntity.setSupId(supId); + } + } else { + String supId = checkExitSup(warehouseEntity.getRelId()); if (supId == null) { supId = checkInvExitSup(warehouseEntity); } - } else - supId = originSupId; - if (supId != null) {//&& !supId.equals("MUTI") warehouseEntity.setSupId(supId); } - } else { - String supId = checkExitSup(warehouseEntity.getRelId()); - if (supId == null) { - supId = checkInvExitSup(warehouseEntity); - } - warehouseEntity.setSupId(supId); } + } warehouseService.updateCode(warehouseEntity); } @@ -489,7 +538,18 @@ public class IoTransInoutService { CompanyEntity companyEntity = companyService.findCompany(companyProductRelevanceEntity.getCustomerId()); return companyEntity.getUnitIdFk(); } else if (companyProductRelevanceEntities != null && companyProductRelevanceEntities.size() > 1) { - return "MUTI"; //绑定多个供应商 + String unitFk = companyProductRelevanceEntities.get(0).getUnitFk(); + boolean isMuti = false; + for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) { + if (!unitFk.equals(companyProductRelevanceEntity.getUnitFk())) { + isMuti = true; + break; + } + } + if (isMuti) + return "MUTI"; //绑定多个供应商 + else + return unitFk; } return null; } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml index bc12f85..811bd3a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml @@ -18,9 +18,9 @@ appid=#{appid}, name=#{name}, - api_Key=#{apiKey}, - secret_Key=#{secretKey}, - create_Date=#{createDate} + apiKey=#{apiKey}, + secretKey=#{secretKey}, + createDate=#{createDate} customerId=#{customerId} companyName=#{companyName} diff --git a/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml index 1daea5b..1f35662 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml @@ -7,20 +7,25 @@ insert INTO scheduled - (cronName,cron,customerId) - values - ( - #{cronName}, - #{cron}, - #{customerId} - ) + (cronName, cron, customerId) + values (#{cronName}, + #{cron}, + #{customerId}) - delete from scheduled where id = #{id} + delete + from scheduled + where id = #{id} - + + UPDATE sys_scheduled + + cron=#{cron}, + + WHERE cronName=#{cronName} +