diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java index 73c31cb..f5a0498 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java @@ -88,6 +88,7 @@ public class ConstantStatus { public static final int FROM_PC = 5; //pc端扫码精灵 public static final int FROM_CHANGE = 6; //单据流转 public static final int FROM_UDISP = 7; //udi供应商平台 + public static final int FROM_PEACE_CHANGE = 8; //平衡补单 //DI类型 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 33c5905..81629a0 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 @@ -72,7 +72,7 @@ public class BussinessChangeTypeController { bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity(); bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\""); - bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN); + bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN); bussinessChangeTypeEntity2.setIndex(1); bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2); @@ -97,6 +97,19 @@ public class BussinessChangeTypeController { return ResultVOUtils.success(bussinessTypeEntities); } + @AuthRuleAnnotation("") + @PostMapping("/spms/bussinessChangeType/remove") + public BaseResponse removeBussinessType(@RequestBody BussinessChangeTypeEntity deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String action = deleteRequest.getScAction(); + bussinessChangeTypeService.deleteByAction(action); + return ResultVOUtils.success("删除成功"); + } + + @AuthRuleAnnotation("") @PostMapping("/spms/bussinessChangeType/delete") public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index e0cf655..ef46ca6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -236,6 +236,26 @@ public class UdiRelevanceController { return ResultVOUtils.success("更新成功"); } + + //新增或修改关联 + @AuthRuleAnnotation("") + @PostMapping("/udi/udirel/check/udi") + public BaseResponse checkUdi(@RequestBody CombineRequest combineRequest) { + + List keys = combineRequest.getKeys(); + if (keys != null && keys.size() > 0) { + + List datas = udiRelevanceService.batchSelectByUuid(keys); + if (datas.isEmpty()) { + return ResultVOUtils.success("无被选入！"); + } else { + return ResultVOUtils.error(499, "所选产品DI已经被"+"第三方产品ID"+"绑定，您确定继续对照"); + } + } + return ResultVOUtils.success("合并成功"); + } + + //新增或修改关联 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/revleance") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 5748925..1bc594f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -445,8 +445,13 @@ public class OrderController { } StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(billNo); + if(StrUtil.isEmpty(stockOrderEntity.getSupplementNo())){ + return orderService.supplementOrder(stockOrderEntity.getBillNo(), stockOrderEntity.getOrderIdFk()); + }else { + return ResultVOUtils.error(500,"当前单据已补单，请勿重复补单"); + } + - return orderService.supplementOrder(stockOrderEntity.getBillNo(), stockOrderEntity.getOrderIdFk()); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java index 227fb7a..c66fe0c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java @@ -193,6 +193,10 @@ public class CheckOrderUtils { if (bussinessTypeEntity.isSecCheckChange()) { return ConstantStatus.SORDER_CHECKED; } + }else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PEACE_CHANGE) { + if (bussinessTypeEntity.isSecCheckBalacne()) { + return ConstantStatus.SORDER_CHECKED; + } } } else { return ConstantStatus.SORDER_DELIVER; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java index 462821b..6742f98 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java @@ -7,6 +7,7 @@ import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity; +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.req.inout.DeleteRequest; import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest; import com.glxp.sale.admin.req.inventory.FilterInvProductRequest; @@ -18,6 +19,7 @@ import com.glxp.sale.admin.res.inventory.InvProductStatResponse; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inventory.InvPreProductDetailService; import com.glxp.sale.admin.service.inventory.InvPreProductService; +import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -42,6 +44,8 @@ public class InvPreProductsController { InvPreProductDetailService invProductDetailService; @Resource private CompanyService companyService; + @Resource + private InvWarehouseService invWarehouseService; @AuthRuleAnnotation("") @GetMapping("spms/pre/inv/products/filter") @@ -53,6 +57,7 @@ public class InvPreProductsController { } else { CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId())); filterInvProductRequest.setSupId(companyEntity.getUnitIdFk()); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(true, true); filterInvProductRequest.setCustomerId(null); } List invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java index f0c8c60..b99d335 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java @@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity; +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inventory.FilterCodeTraceRequest; @@ -27,6 +28,7 @@ import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.inventory.InvProductDetailService; import com.glxp.sale.admin.service.inventory.InvProductService; +import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -61,6 +63,8 @@ public class InvProductsController { private UdiInfoService udiInfoService; @Resource private CompanyService companyService; + @Resource + private InvWarehouseService invWarehouseService; @AuthRuleAnnotation("") @GetMapping("spms/inv/products/filter") @@ -72,6 +76,8 @@ public class InvProductsController { } else { CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId())); filterInvProductRequest.setSupId(companyEntity.getUnitIdFk()); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true); + filterInvProductRequest.setInvStorageCode(invWarehouseEntity.getCode()); filterInvProductRequest.setCustomerId(null); } // filterInvProductRequest.setGroupType("invStorageCode"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java index d83dc42..b26be32 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java @@ -99,7 +99,10 @@ public class SystemParamConfigController { //出入库新增单据校验 if (systemParamConfigSaveRequest.getParamKey().equals("io_transInout_interval")) { try { - int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue()); + int time = 5; + if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) { + time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue()); + } String cronStr = CronUtils.parseMinuteIntervel(time); ScheduledEntity scheduledEntity = new ScheduledEntity(); scheduledEntity.setCron(cronStr); @@ -110,7 +113,10 @@ public class SystemParamConfigController { } } else if (systemParamConfigSaveRequest.getParamKey().equals("io_erpcheck_interval")) { try { - int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue()); + int time = 5; + if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) { + time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue()); + } String cronStr = CronUtils.parseMinuteIntervel(time); ScheduledEntity scheduledEntity = new ScheduledEntity(); scheduledEntity.setCron(cronStr); @@ -121,7 +127,10 @@ public class SystemParamConfigController { } } else if (systemParamConfigSaveRequest.getParamKey().equals("supplement_order_interval")) { try { - int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue()); + int time = 5; + if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) { + time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue()); + } String cornStr = CronUtils.parseMinuteIntervel(time); ScheduledEntity scheduledEntity = new ScheduledEntity(); scheduledEntity.setCron(cornStr); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessChangeTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessChangeTypeDao.java index 8d166cc..1f93ac2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessChangeTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessChangeTypeDao.java @@ -19,4 +19,7 @@ public interface BussinessChangeTypeDao { boolean insertBusChangeTypee(BussinessChangeTypeEntity bussinessTypeEntity); boolean deleteById(@Param("id") String id); + + boolean deleteByAction(@Param("scAction") String scAction); + } 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 c9e940f..cb24a7d 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 @@ -13,7 +13,6 @@ public class BussinessLocalTypeEntity { private String mainAction; private String localName; private String remark; - private Boolean enable; private boolean checkEnable; private boolean advanceType; private boolean changeEnable; 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 e56f5e7..d67ff1a 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 @@ -28,6 +28,7 @@ public class BussinessTypeEntity { private boolean checkWebNew; private boolean checkChange; + private boolean secCheckUdims; private boolean secCheckPdaEd; private boolean secCheckPdaUn; @@ -35,6 +36,9 @@ public class BussinessTypeEntity { private boolean secCheckWebNew; private boolean secCheckChange; + private boolean checkBalacne; + private boolean secCheckBalacne; + private int corpType; private String storageCode; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java index 90453b9..3915e5f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java @@ -37,6 +37,10 @@ public class UdiInfoEntity { private String manufactory; private String measname; private Integer productType; + private String scbssfbhph; + private String scbssfbhxlh; + private String scbssfbhscrq; + private String scbssfbhsxrq; //本地生成信息 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java index c44e3f8..07cb9da 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java @@ -50,6 +50,7 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String sptm; private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询 + private Boolean isDisable; } 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 d2de449..9d87c47 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 @@ -47,4 +47,8 @@ public class BussinessTypResponse { //启用默认补单 private boolean enableSupplementOrder; + + + private boolean checkBalacne; + private boolean secCheckBalacne; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java index 5602594..a0f39c9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java @@ -56,6 +56,11 @@ public class UdiRelevanceResponse { private Integer lockStatus; private String udplatCode; private Boolean isAdavence; + private String scbssfbhph; + private String scbssfbhxlh; + private String scbssfbhscrq; + private String scbssfbhsxrq; + public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/StockOrderDetailResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/StockOrderDetailResponse.java index e9b946b..f6d79e2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/StockOrderDetailResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/StockOrderDetailResponse.java @@ -23,4 +23,16 @@ public class StockOrderDetailResponse { private String ylqxzcrbarmc; private String zczbhhzbapzbh; private BigDecimal price; + + //销售清单号（第二票） + private String secSalesListNo; + + //销售发票号（第一票） + private String firstSalesInvNo; + + //销售发票号（第二票） + private String secSalesInvNo; + + //开票日期 + private String invoiceDate; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessChangeTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessChangeTypeService.java index 81f3392..e32b89a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessChangeTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessChangeTypeService.java @@ -19,4 +19,5 @@ public interface BussinessChangeTypeService { boolean deleteById(String id); + boolean deleteByAction(String scAction); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java index 31296f7..8036701 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java @@ -4,6 +4,7 @@ package com.glxp.sale.admin.service.basic; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,6 +24,8 @@ public interface UdiRelevanceService { boolean isExitByUuid(String uuid); + List batchSelectByUuid(List uuids); + List selectByUuid(String uuid); UdiRelevanceEntity selectById(String id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java index 4b0575c..ffd41e0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java @@ -50,4 +50,9 @@ public class BussinessChangeTypeServiceaImpl implements BussinessChangeTypeServi public boolean deleteById(String id) { return bussinessChangeTypeDao.deleteById(id); } + + @Override + public boolean deleteByAction(String scAction) { + return bussinessChangeTypeDao.deleteByAction(scAction); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java index cd34f7f..bf2de3f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -95,6 +95,11 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { return false; } + @Override + public List batchSelectByUuid(List uuids) { + return udiRelevanceDao.batchSelectByUuid(uuids); + } + @Override public List selectByUuid(String uuid) { return udiRelevanceDao.selectByUuid(uuid); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 5d41192..27f0c2a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -214,7 +214,7 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setLocStorageCode(order.getFromCorpId()); String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); supplementOrder.setFromCorp(name); - supplementOrder.setFromType(ConstantStatus.FROM_CHANGE); + supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE); BussinessTypeEntity supplementType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType()); supplementOrder.setMainAction(supplementType.getMainAction()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index 4a31942..8681749 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -1070,14 +1070,12 @@ public class InvProductsTrService { public InvProductDetailEntity filterInvByCode(List invProductDetailEntities, String code) { - for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { if (invProductDetailEntity.getOriginCode().equals(code)) { return invProductDetailEntity; } } return null; - } public int getActCount(WarehouseEntity warehouseEntity) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoErpCheckTask.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoErpCheckTask.java index f7b06b9..5d5215f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoErpCheckTask.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoErpCheckTask.java @@ -41,5 +41,6 @@ public class IoErpCheckTask implements SchedulingConfigurer { private void process() { logger.info("定时校验ERP单---暂停"); // ioTransInoutService.checkOrder(); + } } \ No newline at end of file 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 713e88a..88fbe3d 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 @@ -18,6 +18,7 @@ import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.httpclient.ErpOrderClient; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; @@ -51,6 +52,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.ParseException; import java.util.ArrayList; import java.util.List; @@ -114,7 +116,7 @@ public class IoTransInoutService { myErpOrderService.deleteByOrderId(postOrderRequest.getOldOrderId()); } WarehouseEntity warehouseEntity = warehouseEntityList.get(0); - String orderId = System.currentTimeMillis() + i + ""; + String orderId = "SM" + CustomUtil.getId(); OrderEntity orderSaveRequest = new OrderEntity(); orderSaveRequest.setId(orderId); if (warehouseEntity.getActDate() != null) { @@ -175,8 +177,8 @@ public class IoTransInoutService { } WarehouseEntity warehouseEntity = warehouseEntityList.get(0); - String orderId = "SM" + - CustomUtil.getId() + i + ""; + String orderId = "SM" + CustomUtil.getId() + i + ""; + OrderEntity orderSaveRequest = new OrderEntity(); orderSaveRequest.setId(orderId); if (warehouseEntity.getActDate() != null) { @@ -366,6 +368,38 @@ public class IoTransInoutService { return; } + + //近效期提醒： + SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip"); + int recent = Integer.parseInt(recentParamConfigEntity.getParamValue()); + if (recent > 0) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode()); + if (udiEntity.getExpireDate() != null) { + String expireDate = "20" + udiEntity.getExpireDate(); + long expireTime = DateUtil.parseDateExpire(expireDate); + if (expireTime - System.currentTimeMillis() < recent * 24 * 60 * 60 * 1000) { + orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); + orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "临近过期！"); + return; + } + } + } + + //过期提醒： + SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip"); + if (!"0".equals(expireParamConfigEntity.getParamValue())) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode()); + if (udiEntity.getExpireDate() != null) { + String expireDate = "20" + udiEntity.getExpireDate(); + long expireTime = DateUtil.parseDateExpire(expireDate); + if (expireTime - System.currentTimeMillis() < 0) { + orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); + orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "已经过期！"); + return; + } + } + } + List udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode()); if (udiRelevanceResponses.size() == 1) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0); @@ -500,6 +534,11 @@ public class IoTransInoutService { unCheckFinish(orderEntity, warehouseEntityList); return; } + } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PEACE_CHANGE) { + if (!bussinessTypeEntity.isCheckBalacne()) { + unCheckFinish(orderEntity, warehouseEntityList); + return; + } } genOrderDetail(warehouseEntityList); checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutTask.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutTask.java index f785d52..46ea4cf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutTask.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutTask.java @@ -2,8 +2,10 @@ package com.glxp.sale.admin.thread; import com.glxp.sale.admin.dao.info.ScheduledDao; import com.glxp.sale.admin.entity.info.ScheduledEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.httpclient.UdiDlHttpClient; import com.glxp.sale.admin.req.udid.ScheduledRequest; +import com.glxp.sale.admin.service.param.SystemParamConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; @@ -24,6 +26,8 @@ public class IoTransInoutTask implements SchedulingConfigurer { protected ScheduledDao scheduledDao; @Resource private IoTransInoutService ioTransInoutService; + @Resource + SystemParamConfigService systemParamConfigService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { @@ -42,7 +46,11 @@ public class IoTransInoutTask implements SchedulingConfigurer { private void process() { - logger.info("定时重码校验"); - ioTransInoutService.transInout(); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("io_transInout_interval"); + if (!"0".equals(systemParamConfigEntity.getParamValue())) { + logger.info("定时重码校验"); + ioTransInoutService.transInout(); + } + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/SupplementOrderTask.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/SupplementOrderTask.java index 2014a1c..7be251b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/SupplementOrderTask.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/SupplementOrderTask.java @@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollUtil; import com.glxp.sale.admin.dao.info.ScheduledDao; import com.glxp.sale.admin.entity.info.ScheduledEntity; import com.glxp.sale.admin.entity.inout.StockOrderEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.req.udid.ScheduledRequest; import com.glxp.sale.admin.res.inout.StockOrderResponse; import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.inout.StockOrderService; +import com.glxp.sale.admin.service.param.SystemParamConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; @@ -33,7 +35,8 @@ public class SupplementOrderTask implements SchedulingConfigurer { StockOrderService stockOrderService; @Resource OrderService orderService; - + @Resource + SystemParamConfigService systemParamConfigService; @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { @@ -51,21 +54,27 @@ public class SupplementOrderTask implements SchedulingConfigurer { } private void process() { - log.info("开始扫描补单数据"); - //计数器 - AtomicInteger counter = new AtomicInteger(0); - List orderEntities = stockOrderService.getSupplementOrderBillNoList(); - if (CollUtil.isNotEmpty(orderEntities)) { - List stockOrderResponses = orderService.checkSupplementOrder(orderEntities); - for (StockOrderResponse stockOrderRespons : stockOrderResponses) { - if (stockOrderRespons.isEnableSupplementOrder()) { - //此单据可以补单 - orderService.supplementOrder(stockOrderRespons.getBillNo(), stockOrderRespons.getOrderIdFk()); - counter.addAndGet(1); + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("supplement_order_interval"); + if (!"0".equals(systemParamConfigEntity.getParamValue())) { + log.info("开始扫描补单数据"); + //计数器 + AtomicInteger counter = new AtomicInteger(0); + List orderEntities = stockOrderService.getSupplementOrderBillNoList(); + if (CollUtil.isNotEmpty(orderEntities)) { + List stockOrderResponses = orderService.checkSupplementOrder(orderEntities); + for (StockOrderResponse stockOrderRespons : stockOrderResponses) { + if (stockOrderRespons.isEnableSupplementOrder()) { + //此单据可以补单 + orderService.supplementOrder(stockOrderRespons.getBillNo(), stockOrderRespons.getOrderIdFk()); + counter.addAndGet(1); + } } } + log.info("补单结束，此次补单数量为：{}", counter.get()); } - log.info("补单结束，此次补单数量为：{}", counter.get()); + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java index 99861b3..b725462 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java @@ -150,6 +150,16 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils { } + public static Long parseDateExpire(String str) { + try { + return DateUtil.parseDate(str, "yyyyMMdd").getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } + return 0l; + } + + /** * 获取过去的天数 * diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml index 82604e8..feaab14 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml @@ -47,6 +47,13 @@ + + DELETE + FROM basic_bustype_pre + WHERE scAction = #{scAction} + + + @@ -108,9 +100,6 @@ AND basic_bustype_local.action LIKE concat(#{action},'%') - - AND basic_bustype_local.enable =#{enabled} - AND spUse =#{spUse} @@ -121,10 +110,9 @@ INSERT INTO basic_bustype_local - (action, name, enable, remark, originAction, advanceType, changeEnable, spUse) + (action, name, remark, originAction, advanceType, changeEnable, spUse) values (#{action}, #{name}, - #{enable}, #{remark}, #{originAction}, #{advanceType}, #{changeEnable}, #{spUse}) @@ -133,7 +121,6 @@ action = #{action}, name = #{name}, - enable = #{enable}, remark = #{remark}, originAction = #{originAction}, advanceType = #{advanceType}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 6847ad5..f168271 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -15,7 +15,8 @@ basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange, basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder, - basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode + basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne, + basic_bussiness_type.secCheckBalacne FROM basic_bussiness_type LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = basic_bustype_local.action @@ -90,7 +91,8 @@ basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange, basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder, - basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode + basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne, + basic_bussiness_type.secCheckBalacne FROM basic_bussiness_type LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = basic_bustype_local.action INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action @@ -116,6 +118,7 @@ AND basic_bustype_local.spUse =#{spUse} + group by basic_bussiness_type.action @@ -166,7 +169,7 @@ (`index`,action,name,enable,remark,mainAction,localAction,thirdSysFk, checkEnable,genUnit,innerOrder,secCheckEnable, checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange - ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType,storageCode) + ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne) values ( #{index}, @@ -194,7 +197,7 @@ #{secCheckWebNew}, #{secCheckChange}, #{corpType}, - #{storageCode} + #{storageCode},#{checkBalacne},#{secCheckBalacnesecCheckBalacne} ) @@ -224,6 +227,8 @@ secCheckPc=#{secCheckPc}, secCheckWebNew=#{secCheckWebNew}, secCheckChange=#{secCheckChange}, + checkBalacne=#{checkBalacne}, + secCheckBalacne=#{secCheckBalacne}, index=#{index}, corpType=#{corpType}, storageCode=#{storageCode}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index 7e28056..2d1e7d6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -36,9 +36,11 @@ basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey, basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb, basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType - - + basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq FROM (company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id) @@ -46,7 +48,6 @@ ON basic_udirel.uuid = basic_products.uuid - AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%') @@ -58,16 +59,16 @@ AND nameCode LIKE concat(#{nameCode},'%') - or nameCode LIKE concat('%',#{unionCode},'%') - or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%') - or basic_udirel.sptm LIKE concat('%',#{unionCode},'%') + or nameCode LIKE concat('%',#{unionCode},'%') + or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%') + or basic_udirel.sptm LIKE concat('%',#{unionCode},'%') - or thirdId LIKE concat('%',#{thrPiId},'%') - or thirdId1 LIKE concat('%',#{thrPiId},'%') - or thirdId2 LIKE concat('%',#{thrPiId},'%') - or thirdId3 LIKE concat('%',#{thrPiId},'%') - or thirdId4 LIKE concat('%',#{thrPiId},'%') + or thirdId LIKE concat('%',#{thrPiId},'%') + or thirdId1 LIKE concat('%',#{thrPiId},'%') + or thirdId2 LIKE concat('%',#{thrPiId},'%') + or thirdId3 LIKE concat('%',#{thrPiId},'%') + or thirdId4 LIKE concat('%',#{thrPiId},'%') AND uuid = #{uuid} @@ -85,7 +86,7 @@ ORDER BY updateTime DESC - + - SELECT * FROM basic_products WHERE ( - uuid = #{uuid} ) limit 1 + SELECT * + FROM basic_products + WHERE ( + uuid = #{uuid}) limit 1 - replace INTO basic_products + replace + INTO basic_products ( nameCode,packRatio,packLevel,bhxjsl, bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber - ,diType,productType) + ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq) values ( - #{nameCode}, - #{packRatio}, - #{packLevel}, - #{bhxjsl}, - #{bhzxxsbzsl}, - #{zxxsbzbhsydysl}, - #{bhxjcpbm}, - #{bzcj}, - #{addType}, - #{deviceRecordKey}, - #{cpmctymc}, - #{cplb}, - #{flbm}, - #{ggxh}, - #{qxlb}, - #{tyshxydm}, - #{ylqxzcrbarmc}, - #{zczbhhzbapzbh}, - #{ylqxzcrbarywmc}, - #{uuid}, - #{sjcpbm}, - #{versionNumber}, - #{diType},#{productType} - ) + #{nameCode}, + #{packRatio}, + #{packLevel}, + #{bhxjsl}, + #{bhzxxsbzsl}, + #{zxxsbzbhsydysl}, + #{bhxjcpbm}, + #{bzcj}, + #{addType}, + #{deviceRecordKey}, + #{cpmctymc}, + #{cplb}, + #{flbm}, + #{ggxh}, + #{qxlb}, + #{tyshxydm}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarywmc}, + #{uuid}, + #{sjcpbm}, + #{versionNumber}, + #{diType}, + #{productType}, + #{scbssfbhph}, + #{scbssfbhxlh}, + #{scbssfbhscrq}, + #{scbssfbhsxrq} + ) @@ -151,7 +164,7 @@ nameCode,packRatio,packLevel,bhxjsl, bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber - ,diType,productType + ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq ) values @@ -180,17 +193,24 @@ #{item.uuid}, #{item.sjcpbm}, #{item.versionNumber}, - #{item.diType},#{item.productType} + #{item.diType},#{item.productType}, #{item.scbssfbhph}, + #{item.scbssfbhxlh}, + #{item.scbssfbhscrq}, + #{item.scbssfbhsxrq} ) - DELETE FROM basic_products WHERE id = #{id} + DELETE + FROM basic_products + WHERE id = #{id} - DELETE FROM basic_products WHERE uuid = #{uuid} + DELETE + FROM basic_products + WHERE uuid = #{uuid} @@ -222,7 +242,10 @@ measname=#{measname}, diType=#{diType}, productType=#{productType}, - + scbssfbhph=#{scbssfbhph}, + scbssfbhxlh=#{scbssfbhxlh}, + scbssfbhscrq=#{scbssfbhscrq}, + scbssfbhsxrq=#{scbssfbhsxrq}, WHERE nameCode = #{nameCode} @@ -240,7 +263,7 @@ (id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType, deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname, - productType) values + productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq) values (#{item.id}, #{item.nameCode}, @@ -271,7 +294,10 @@ #{item.sptm}, #{item.manufactory}, #{item.measname}, - #{item.productType}) + #{item.productType}, #{item.scbssfbhph}, + #{item.scbssfbhxlh}, + #{item.scbssfbhscrq}, + #{item.scbssfbhsxrq}) \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index ea6e1a7..116f57d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -21,7 +21,10 @@ basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber, - basic_products.diType,basic_products.productType + basic_products.diType,basic_products.productType,basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq FROM basic_udirel inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid @@ -47,7 +50,6 @@ AND basic_udirel.udplatCode = #{udplatCode} - AND basic_products.diType= #{diType} @@ -96,7 +98,10 @@ basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc, basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, - basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence + basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq FROM basic_products right JOIN basic_udirel ON basic_products.uuid = basic_udirel.uuid @@ -113,6 +118,10 @@ AND nameCode LIKE concat(#{nameCode},'%') + + AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false ) + + and ( nameCode LIKE concat('%',#{unionCode},'%') diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml index f9592a5..e7bbba6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml @@ -42,7 +42,11 @@ basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, - customer_info.companyName, basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence + customer_info.companyName, + basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id @@ -60,15 +64,15 @@ AND nameCode LIKE concat(#{nameCode},'%') - and ( - nameCode LIKE concat('%',#{unionCode},'%') + and ( + nameCode LIKE concat('%',#{unionCode},'%') or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%') or basic_udirel.sptm LIKE concat('%',#{unionCode},'%') ) - and ( - thirdId LIKE concat('%',#{thrPiId},'%') + and ( + thirdId LIKE concat('%',#{thrPiId},'%') or thirdId1 LIKE concat('%',#{thrPiId},'%') or thirdId2 LIKE concat('%',#{thrPiId},'%') or thirdId3 LIKE concat('%',#{thrPiId},'%') @@ -234,7 +238,8 @@ #{update_time}, #{auditStatus}, #{productUuid}, - #{udiRlIdFk},#{unitFk} + #{udiRlIdFk}, + #{unitFk} ) diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml index af39610..dd3e489 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -83,6 +83,7 @@ ,#{item.count} ,#{item.packageLevel} ,#{item.warehouseCode},#{item.nameCode},#{item.supId} ,#{item.relId},#{item.status},#{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode}) + @@ -156,6 +157,7 @@ FROM io_codes WHERE orderId = #{orderId} + UPDATE io_codes diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index bf45065..b5fc1c6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -211,6 +211,7 @@ + group by io_order.id ORDER BY actDate DESC @@ -281,6 +282,7 @@ and locStorageCode =#{locStorageCode} + group by io_order.id ORDER BY actDate DESC @@ -351,6 +353,7 @@ and locStorageCode =#{locStorageCode} + group by io_order.id ORDER BY actDate DESC @@ -414,7 +417,7 @@ and locStorageCode =#{locStorageCode} - + group by io_order.id @@ -171,6 +173,7 @@ and inv_warehouse_user.userId =#{userId} + group by stock_order.id ORDER BY id DESC @@ -237,7 +240,7 @@ + diff --git a/scripts/vue-admin.sql b/scripts/vue-admin.sql index 7889f20..825196a 100644 --- a/scripts/vue-admin.sql +++ b/scripts/vue-admin.sql @@ -23,4 +23,21 @@ reviewUser int NULL DEFAULT NULL COMMENT '审核用户ID' ); +alter table basic_products add + ( +scbssfbhph VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含批号', +scbssfbhxlh VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含序列号', +scbssfbhscrq VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含生产日期', +scbssfbhsxrq VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含失效日期' +); + + +alter table basic_bussiness_type add + ( +checkBalacne TINYINT NULL DEFAULT NULL COMMENT '平衡补单是否校验', +secCheckBalacne TINYINT NULL DEFAULT NULL COMMENT '平衡不但是否二次验收' + +); + +