diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java index b564f21..1873341 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java @@ -217,18 +217,13 @@ public class UdiInfoController { public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId()); - - - udiRelevanceService.selectByUuid(productInfoFilterRequest.getUuid()); - List udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest); - - if (CollUtil.isNotEmpty(udiInfoEntities)) { for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { if (udiRelevanceEntity != null) { udiInfoEntity.setManufactory(udiRelevanceEntity.getManufactory()); udiInfoEntity.setMeasname(udiRelevanceEntity.getMeasname()); + udiInfoEntity.setPrice(udiRelevanceEntity.getPrice()); } } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index ab2364d..f9fc543 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -9,6 +9,8 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; +import com.glxp.sale.admin.entity.inout.StockOrderEntity; +import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.exception.JsonException; @@ -26,15 +28,14 @@ import com.glxp.sale.admin.res.inout.StockOrderDetailQueryProductResponse; import com.glxp.sale.admin.res.inout.StockOrderDetailResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; -import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; +import com.glxp.sale.admin.service.inout.CodesService; import com.glxp.sale.admin.service.inout.StockOrderDetailService; import com.glxp.sale.admin.service.inout.StockOrderDetailTempService; -import com.glxp.sale.admin.service.inout.StockQRCodeTextService; +import com.glxp.sale.admin.service.inout.StockOrderService; import com.glxp.sale.admin.service.param.SystemParamConfigService; -import com.glxp.sale.admin.thread.IoTransInoutService; import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.common.enums.ResultEnum; @@ -52,6 +53,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collections; import java.util.List; @RestController @@ -60,9 +62,9 @@ public class StockOrderDetailController { @Resource StockOrderDetailService stockOrderDetailService; @Resource - StockOrderDetailTempService stockOrderDetailTempService; + StockOrderService stockOrderService; @Resource - StockQRCodeTextService stockQRCodeTextService; + StockOrderDetailTempService stockOrderDetailTempService; @Resource UdiInfoService udiInfoService; @Resource @@ -70,16 +72,15 @@ public class StockOrderDetailController { @Resource private CompanyProductRelevanceService companyProductRelevanceService; - @Resource - private IoTransInoutService transInoutService; @Autowired private SystemParamConfigService systemParamConfigService; @Resource AuthAdminService authAdminService; @Resource - BussinessTypeService bussinessTypeService; - @Resource BussinessLocalTypeService bussinessLocalTypeService; + @Resource + CodesService codesService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filter") @@ -89,21 +90,15 @@ public class StockOrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + StockOrderEntity stockOrderEntity = stockOrderService.findById(stockOrderDetailFilterRequest.getOrderIdFk()); + String value = systemParamConfigService.selectValueByParamKey("oeder_detail_by_code"); List stockOrderDetailEntityList = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); - -// if (CollUtil.isNotEmpty(stockOrderDetailEntityList)) { -// -// for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { -// UdiRelevanceResponse udiInfoEntity = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId()); -// stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch()); -// stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch()); -// stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch()); -// } -// +// if (StrUtil.isNotEmpty(value) && value.equals("1")) { +// stockOrderDetailEntityList = transferSerList(stockOrderDetailEntityList, stockOrderEntity.getOrderIdFk()); // } - PageInfo pageInfo; pageInfo = new PageInfo<>(stockOrderDetailEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -112,6 +107,36 @@ public class StockOrderDetailController { return ResultVOUtils.success(pageSimpleResponse); } + public List transferSerList(List stockOrderDetailEntities, String orderId) { + List resultList = new ArrayList<>(); + List codeList = codesService.findByReceiptId(orderId); + if (CollUtil.isNotEmpty(stockOrderDetailEntities)) { + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) { + if (CollUtil.isNotEmpty(codeList)) { + for (WarehouseEntity codeDetaiEntity : codeList) { + if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) + && StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())) + ) { + StockOrderDetailEntity item = new StockOrderDetailEntity(); + BeanUtils.copyProperties(stockOrderDetailEntity, item); + item.setCode(codeDetaiEntity.getCode()); + item.setSerialNo(codeDetaiEntity.getSerialNo()); + item.setCount(codeDetaiEntity.getCount() + ""); + resultList.add(item); + } + + + } + } + } + } + Collections.sort(resultList, (o1, o2) -> { + Long cp = Long.parseLong(o1.getProductId()) - Long.parseLong(o2.getProductId()); + return cp.intValue(); + }); + return resultList; + } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filter2") public BaseResponse filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, @@ -458,17 +483,13 @@ public class StockOrderDetailController { BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest); companyProductRelevanceRequest.setIsDisable(false); List basicInstrumentMaintainRelevanceResponses = null; - if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { - BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType()); - if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { - companyProductRelevanceRequest.setCustomerId(null); - companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId()); - basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); - } else { - basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest); - } - } else { + BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType()); + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + companyProductRelevanceRequest.setCustomerId(null); + companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId()); basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); + } else { + basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest); } PageInfo pageInfo; pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsDao.java index eccd94d..f033448 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsDao.java @@ -16,8 +16,11 @@ public interface ThrProductsDao { List batchSelectByIds(FilterThrProductsRequest filterThrProductsRequest); ThrProductsEntity selectById(@Param("id") String id); + List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); + boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity); + boolean insertThrProducts(ThrProductsEntity thrProductsEntity); boolean insertThrProductss(@Param("thrProductsEntities") List thrProductsEntities); 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 aebdd2a..44b6c48 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 @@ -65,6 +65,8 @@ public class UdiInfoEntity { private boolean allowNoExpire; private boolean allowNoProduct; + private String price; + public Integer getId() { return id; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java index ac08589..a0d2817 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java @@ -38,5 +38,6 @@ public class StockOrderDetailEntity { private boolean allowNoBatch; private boolean allowNoExpire; private boolean allowNoProduct; - + private String code; + private String serialNo; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java index 967d408..2b450ca 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java @@ -16,6 +16,8 @@ public interface ThrProductsService { ThrProductsEntity selectById(String id); + boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity); + boolean insertThrProducts(ThrProductsEntity thrProductsEntity); boolean insertThrProductss(List thrProductsEntities); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java index 81289a2..abd78fb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java @@ -54,6 +54,11 @@ public class ThrProductsServiceImpl implements ThrProductsService { return thrProductsDao.selectById(id); } + @Override + public boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity) { + return thrProductsDao.insertOrUpdateSelective(thrProductsEntity); + } + @Override public boolean insertThrProducts(ThrProductsEntity thrProductsEntity) { return thrProductsDao.insertThrProducts(thrProductsEntity); 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 62a943f..9b4cd98 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 @@ -40,6 +40,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -868,6 +869,11 @@ public class IoTransInoutService { stockOrderDetailEntity.setBatchNo(erpOrderEntity.getBatchNo()); stockOrderDetailEntity.setProductDate(erpOrderEntity.getProductDate()); stockOrderDetailEntity.setExpireDate(erpOrderEntity.getExpireDate()); + if (erpOrderEntity.getPrice() == null) { + if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { + stockOrderDetailEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); + } + } // stockOrderDetailEntity.setYlqxzcrbarmc(erpOrderEntity.get()); if (erpOrderEntity.getCount() != null) { stockOrderDetailEntity.setSweepCount(erpOrderEntity.getCount() + "");