diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index e23cdc7..bb29172 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -9,8 +9,11 @@ import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils; import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; +import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.inout.*; +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderEntity; @@ -24,12 +27,10 @@ import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.inout.ErpOrderResponse; import com.glxp.sale.admin.service.auth.CustomerService; -import com.glxp.sale.admin.service.basic.BussinessOriginTypeService; -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.basic.*; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; +import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.thrsys.ThrDataService; import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService; @@ -112,7 +113,7 @@ public class OrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); @@ -150,7 +151,6 @@ public class OrderDetailController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(erpOrderResponses); return ResultVOUtils.success(pageSimpleResponse); -// } } //手持终端下载业务单据 @@ -211,6 +211,9 @@ public class OrderDetailController { // } } + @Resource + BasicBusTypeChangeService basicBusTypeChangeService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/erpOrder/addStockOrder") public BaseResponse addStockOrder(FilterOrderRequest filterErpOrderRequest, @@ -219,16 +222,13 @@ public class OrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - String customerId = customerService.getCustomerId() + ""; - - ThrOrderEntity thrOrderEntity = thrOrderService.findById(String.valueOf(filterErpOrderRequest.getId())); if (thrOrderEntity == null) { return ResultVOUtils.error(ResultEnum.DATA_NOT); } - StockOrderEntity temp = stockOrderService.findByBillNo(thrOrderEntity.getBillNo() + ""); + StockOrderEntity temp = stockOrderService.findByBillNo(thrOrderEntity.getBillNo()); if (temp != null) { return ResultVOUtils.error(500, "单据已被选入,请勿重复选入!"); } @@ -237,8 +237,11 @@ public class OrderDetailController { BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity); String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.BUS_ORDER, "yyyyMMdd")); stockOrderEntity.setBillNo(billNo); + + //第三方单据 BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finByThirdAction(thrOrderEntity.getBillType()); stockOrderEntity.setBillType(bussinessOriginTypeResponse.getLocalAction()); + stockOrderEntity.setId(null); stockOrderEntity.setCustomerId(customerId); stockOrderEntity.setUnitIdFk(customerId); @@ -259,8 +262,14 @@ public class OrderDetailController { List stockOrderDetailEntityList = new ArrayList<>(); for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk()); + + if (udiRelevanceEntity == null) { + return ResultVOUtils.error(500, "单据里含有未维护的产品信息,选入失败!"); + } BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity); - stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId()); +// stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId()); + stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId()); stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + ""); stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + ""); stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId()); @@ -269,8 +278,85 @@ public class OrderDetailController { } stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList); } + thrOrderEntity.setAllocateStatus(1); + thrOrderService.updateThrOrder(thrOrderEntity); + return ResultVOUtils.success(); + + } + + @Resource + InvWarehouseService invWarehouseService; + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/receive/addStockOrder") + public BaseResponse addReceiveOrder(FilterOrderRequest filterErpOrderRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String customerId = customerService.getCustomerId() + ""; + ThrOrderEntity thrOrderEntity = thrOrderService.findById(String.valueOf(filterErpOrderRequest.getId())); + if (thrOrderEntity == null) { + return ResultVOUtils.error(ResultEnum.DATA_NOT); + } + StockOrderEntity temp = stockOrderService.findByBillNo(thrOrderEntity.getBillNo()); + if (temp != null) { + return ResultVOUtils.error(500, "单据已被选入,请勿重复选入!"); + } + StockOrderEntity stockOrderEntity = new StockOrderEntity(); + BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity); + String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.BUS_ORDER, "yyyyMMdd")); + stockOrderEntity.setBillNo(billNo); + + BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.findByAction(thrOrderEntity.getBillType()); + stockOrderEntity.setBillType(basicBusTypeChangeEntity.getTargetBusAction()); + + stockOrderEntity.setId(null); + stockOrderEntity.setCustomerId(customerId); + stockOrderEntity.setUnitIdFk(customerId); + stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交 + stockOrderEntity.setLocStorageCode(thrOrderEntity.getCorpId()); + stockOrderEntity.setInvWarehouseCode(thrOrderEntity.getFromSubInvCode()); + stockOrderEntity.setThirdOrderFk(thrOrderEntity.getBillNo()); + stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交 + stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印 + stockOrderEntity.setFromSubInvCode(thrOrderEntity.getInvWarehouseCode()); + stockOrderEntity.setCorpId(thrOrderEntity.getLocStorageCode()); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(thrOrderEntity.getLocStorageCode()); + stockOrderEntity.setCorpName(invWarehouseEntity.getName()); + stockOrderEntity.setBilldate(DateUtil.formatDate(new Date())); + boolean b = stockOrderService.insertStockOrder(stockOrderEntity); + stockOrderEntity = stockOrderService.findByBillNo(billNo); + FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); + filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); + List thrOrderDetailEntities = + thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { + List stockOrderDetailEntityList = new ArrayList<>(); + for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { + StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk()); + + if (udiRelevanceEntity == null) { + return ResultVOUtils.error(500, "单据里含有未维护的产品信息,选入失败!"); + } + BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity); +// stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId()); + stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId()); + stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + ""); + stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + ""); + stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId()); + stockOrderDetailEntity.setSweepCount(0 + ""); + stockOrderDetailEntityList.add(stockOrderDetailEntity); + } + stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList); + } + thrOrderEntity.setAllocateStatus(1); + thrOrderService.updateThrOrder(thrOrderEntity); return ResultVOUtils.success(); + } @AuthRuleAnnotation("") 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 4285c17..f8adfe0 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 @@ -364,17 +364,19 @@ public class StockOrderDetailController { if (stockOrderDetailEntityList.size() == 0) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品"); } - - String value = systemParamConfigService.selectValueByParamKey("checkCert"); - if (StrUtil.isNotEmpty(value) && value.equals("1")) { - //判断证书是否齐全 - if (StrUtil.isNotEmpty(stockOrderIdsRequest.getZczbhhzbapzbh())) { - SupProductResponse supProductResponse = supProductService.findByPassByReCert(stockOrderIdsRequest.getZczbhhzbapzbh()); - if (supProductResponse == null) { - return ResultVOUtils.error(601, "该产品所对应的资质证书未通过审核,无法配送,请先维护产品资质信息"); + //供应商选入时需要校验证书是否齐全 + if (stockOrderIdsRequest.getType() == 0) { + String value = systemParamConfigService.selectValueByParamKey("checkCert"); + if (StrUtil.isNotEmpty(value) && value.equals("1")) { + //判断证书是否齐全 + if (StrUtil.isNotEmpty(stockOrderIdsRequest.getZczbhhzbapzbh())) { + SupProductResponse supProductResponse = supProductService.findByPassByReCert(stockOrderIdsRequest.getZczbhhzbapzbh()); + if (supProductResponse == null) { + return ResultVOUtils.error(601, "该产品所对应的资质证书未通过审核,无法配送,请先维护产品资质信息"); + } + } else { + return ResultVOUtils.error(500, "注册证不能为空!"); } - } else { - return ResultVOUtils.error(500, "注册证不能为空!"); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java index 1d91c93..e3b5f2e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java @@ -3,11 +3,17 @@ package com.glxp.sale.admin.controller.thrsys; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.sale.admin.req.inout.FilterOrderRequest; import com.glxp.sale.admin.req.inout.StockOrderPostRequest; +import com.glxp.sale.admin.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.inout.ErpOrderResponse; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService; import com.glxp.sale.admin.service.thrsys.ThrOrderService; @@ -18,11 +24,13 @@ import com.glxp.sale.common.util.ResultVOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -40,8 +48,7 @@ public class ThrOrderReceiveController { @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/order/insertWeb") - public BaseResponse insertWeb(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) { - //editState 1为草稿保存 2为提交保存 + public BaseResponse addReceive(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -52,39 +59,103 @@ public class ThrOrderReceiveController { stockOrderEntity.setType(1);//领用单据 stockOrderEntity.setUpdateTime(new Date()); stockOrderEntity.setBilldate(DateUtil.parse(stockOrderEntity.getBilldate(), DatePattern.NORM_DATETIME_PATTERN).toString()); - ThrOrderEntity temp = thrOrderService.findByUnique(stockOrderEntity.getBillNo(), stockOrderEntity.getThirdSysFk()); - if (temp != null) { - stockOrderEntity.setId(temp.getId()); - } String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd")); stockOrderEntity.setBillNo(orderNo); thrOrderService.insertThrOrder(stockOrderEntity); - stockOrderEntity = thrOrderService.findByUnique(stockOrderEntity.getBillNo(), stockOrderEntity.getThirdSysFk()); - if (stockOrderPostRequest.getSubErpOrders() != null) { List stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders(); for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { - ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); BeanUtils.copyProperties(stockOrderDetailEntity, thrOrderDetailEntity); - thrOrderDetailEntity.setOrderIdFk( - StringUtils.isBlank(stockOrderDetailEntity.getOrderIdFk()) ? - stockOrderEntity.getId() + "" : stockOrderDetailEntity.getOrderIdFk()); + thrOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId() + ""); + thrOrderDetailEntity.setReCount( + StringUtils.isBlank(stockOrderDetailEntity.getReCount()) ? 0 : Integer.parseInt(stockOrderDetailEntity.getReCount())); + thrOrderDetailEntity.setCount( + StringUtils.isBlank(stockOrderDetailEntity.getCount()) ? 0 : Integer.parseInt(stockOrderDetailEntity.getCount())); + thrOrderDetailService.insertThrOrderDetail(thrOrderDetailEntity); + } + return ResultVOUtils.success("成功"); + } + return ResultVOUtils.success("成功"); + } - if (StringUtils.isBlank(stockOrderDetailEntity.getId())) { - thrOrderDetailEntity.setReCount( - StringUtils.isBlank(stockOrderDetailEntity.getReCount()) ? 0 : Integer.parseInt(stockOrderDetailEntity.getReCount())); - thrOrderDetailEntity.setCount( - StringUtils.isBlank(stockOrderDetailEntity.getCount()) ? 0 : Integer.parseInt(stockOrderDetailEntity.getCount())); + @AuthRuleAnnotation("") + @PostMapping("/udiwms/receive/order/update") + public BaseResponse updateReceive(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) { + //editState 1为草稿保存 2为提交保存 + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + ThrOrderEntity stockOrderEntity = new ThrOrderEntity(); + BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity); + stockOrderEntity.setType(1);//领用单据 + stockOrderEntity.setUpdateTime(new Date()); + stockOrderEntity.setId(Integer.parseInt(stockOrderPostRequest.getId())); + stockOrderEntity.setBilldate(DateUtil.parse(stockOrderEntity.getBilldate(), DatePattern.NORM_DATETIME_PATTERN).toString()); + thrOrderService.updateThrOrder(stockOrderEntity); + thrOrderDetailService.deleteByOrderIdFk(stockOrderEntity.getId() + ""); + List stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders(); + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { + ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); + BeanUtils.copyProperties(stockOrderDetailEntity, thrOrderDetailEntity); + thrOrderDetailEntity.setOrderIdFk( + StringUtils.isBlank(stockOrderDetailEntity.getOrderIdFk()) ? + stockOrderEntity.getId() + "" : stockOrderDetailEntity.getOrderIdFk()); + thrOrderDetailEntity.setReCount( + StringUtils.isBlank(stockOrderDetailEntity.getReCount()) ? 0 : Integer.parseInt(stockOrderDetailEntity.getReCount())); + thrOrderDetailEntity.setCount( + StringUtils.isBlank(stockOrderDetailEntity.getCount()) ? 0 : Integer.parseInt(stockOrderDetailEntity.getCount())); + + thrOrderDetailService.insertThrOrderDetail(thrOrderDetailEntity); + } + return ResultVOUtils.success("成功"); + } + + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/receive/order/filter") + public BaseResponse filterReceive(FilterOrderRequest filterErpOrderRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } - thrOrderDetailService.insertThrOrderDetail(thrOrderDetailEntity); + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); + filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); + filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); + List erpOrderResponses = new ArrayList<>(); + List data = thrOrderService.filterReceiveOrder(filterThrOrderRequest); + if (data != null && data.size() > 0) { + for (ThrOrderEntity thrOrderEntity : data) { + FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); + filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); + List thrOrderDetailEntities = + thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + ErpOrderResponse erpOrderResponse = new ErpOrderResponse(); + BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + List subErpOrders = new ArrayList<>(); + if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { + for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { + ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder(); + BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + subErpOrder.setCount(thrOrderDetailEntity.getCount() + ""); + subErpOrder.setReCount(thrOrderDetailEntity.getReCount() + ""); + subErpOrders.add(subErpOrder); + } } + erpOrderResponse.setSubErpOrders(subErpOrders); + erpOrderResponses.add(erpOrderResponse); } - - return ResultVOUtils.success("成功"); } - return ResultVOUtils.success("成功"); + PageInfo pageInfo; + pageInfo = new PageInfo<>(data); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(erpOrderResponses); + return ResultVOUtils.success(pageSimpleResponse); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrOrderDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrOrderDao.java index 15bb568..587245f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrOrderDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrOrderDao.java @@ -12,6 +12,8 @@ public interface ThrOrderDao { List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); + List filterReceiveOrder(FilterThrOrderRequest filterThrOrderRequest); + boolean insertThrOrder(ThrOrderEntity thrCorpEntity); boolean importThrOrder(ThrOrderEntity thrCorpEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBusTypeChangeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBusTypeChangeEntity.java index b30a563..0f6b20a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBusTypeChangeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBusTypeChangeEntity.java @@ -16,8 +16,6 @@ public class BasicBusTypeChangeEntity { private Date updateTime; private String remark; private boolean enable; - - - + private boolean systemDefault; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java index f9c6e5a..d2635fd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java @@ -12,6 +12,7 @@ public class ThrOrderEntity { private String billdate; private String corpId; private String corpName; + private String fromSubInvCode; private String billType; private String billTypeName; private String billFlag; @@ -38,4 +39,5 @@ public class ThrOrderEntity { private String invWarehouseCode; private int editStatus; private int thirdPartyDate; + private int allocateStatus; //1:已配货;0:未配货 } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java index 94633b1..3cd2c19 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java @@ -27,5 +27,7 @@ public class FilterOrderRequest { private String thirdSys; private Integer editStatus; private Integer thirdPartyDate; + private Integer type; + private Integer allocateStatus; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java index 24c053d..6d03f69 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java @@ -16,4 +16,5 @@ public class StockOrderIdsRequest { UdiEntity udiEntity; List stockOrderLists; private String zczbhhzbapzbh; + private int type; //1:耗材领用 } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrOrderRequest.java index a794129..03e1ebc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrOrderRequest.java @@ -25,6 +25,7 @@ public class FilterThrOrderRequest extends ListPageRequest { private Integer editStatus; private String lastUpdateTime; private Integer thirdPartyDate; - + private Integer type; + private Integer allocateStatus; private List erpOrderResponses; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrOrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrOrderService.java index 98d04e0..988d6c9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrOrderService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrOrderService.java @@ -12,12 +12,16 @@ public interface ThrOrderService { List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); + List filterReceiveOrder(FilterThrOrderRequest filterThrOrderRequest); + List filterAllOrders(List billNos, String action); List filterAllDetail(FilterThrOrderRequest filterThrOrderRequest); ThrOrderEntity findByUnique(String billNo, String thirdSysFk); + ThrOrderEntity findReceiveOrder(String billNo); + ThrOrderEntity findById(String id); boolean insertThrOrder(ThrOrderEntity thrCorpEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrOrderServiceImpl.java index ac7223c..b0d604d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrOrderServiceImpl.java @@ -39,6 +39,19 @@ public class ThrOrderServiceImpl implements ThrOrderService { return data; } + @Override + public List filterReceiveOrder(FilterThrOrderRequest filterThrOrderRequest) { + if (filterThrOrderRequest == null) { + return Collections.emptyList(); + } + if (filterThrOrderRequest.getPage() != null) { + int offset = (filterThrOrderRequest.getPage() - 1) * filterThrOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrOrderRequest.getLimit()); + } + List data = thrOrderDao.filterReceiveOrder(filterThrOrderRequest); + return data; + } + @Override public List filterAllOrders(List billNos, String thirdSys) { List erpOrderEntities = new ArrayList<>(); @@ -109,6 +122,21 @@ public class ThrOrderServiceImpl implements ThrOrderService { return null; } + @Override + public ThrOrderEntity findReceiveOrder(String billNo) { + if (StrUtil.isEmpty(billNo)) { + return null; + } + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + filterThrOrderRequest.setBillNo(billNo); + filterThrOrderRequest.setType(1); + List thrOrderEntities = filterThrOrder(filterThrOrderRequest); + if (thrOrderEntities != null && thrOrderEntities.size() > 0) { + return thrOrderEntities.get(0); + } + return null; + } + @Override public ThrOrderEntity findById(String id) { FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml index fb95daf..bfb3113 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -48,12 +48,13 @@ parameterType="com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity"> insert INTO basic_bustype_change - (`originAction`, originName, `targetBusAction`, targetScAction, `type`, updateTime, remark, enable) + (`originAction`, originName, `targetBusAction`, targetScAction, `type`, updateTime, remark, enable, + systemDefault) values (#{originAction}, #{originName}, #{targetBusAction}, #{targetScAction}, - #{type}, #{updateTime}, #{remark}, #{enable}) + #{type}, #{updateTime}, #{remark}, #{enable}, #{systemDefault}) @@ -67,6 +68,8 @@ remark = #{remark}, updateTime = #{updateTime}, `type` = #{type}, + `systemDefault` = #{systemDefault}, + WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index 7ef0b91..18727c4 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -30,6 +30,9 @@ AND thirdSysFk = #{thirdSysFk} + + AND thr_order.`type` = #{type} + AND corpName like concat('%',#{corpName},'%') @@ -42,6 +45,9 @@ AND editStatus = #{editStatus} + + AND allocateStatus = #{allocateStatus} + AND thirdPartyDate = #{thirdPartyDate} @@ -52,13 +58,68 @@ ORDER BY thr_order.updateTime DESC + - + + replace INTO thr_order (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk, startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, - remark3,locStorageCode,editStatus,invWarehouseCode,thirdPartyDate) + remark3,locStorageCode,editStatus,invWarehouseCode,thirdPartyDate,fromSubInvCode,`type`,allocateStatus) values ( #{id}, #{billNo}, @@ -85,7 +146,10 @@ #{locStorageCode}, #{editStatus}, #{invWarehouseCode}, - #{thirdPartyDate} + #{thirdPartyDate}, + #{fromSubInvCode}, + #{type}, + #{allocateStatus} ) @@ -93,7 +157,7 @@ replace INTO thr_order (billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk, startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, - remark3,locStorageCode,editStatus,invWarehouseCode) + remark3,locStorageCode,editStatus,invWarehouseCode,fromSubInvCode,`type`,allocateStatus) values @@ -151,6 +216,10 @@ editStatus=#{editStatus}, thirdPartyDate=#{thirdPartyDate}, invWarehouseCode=#{invWarehouseCode}, + fromSubInvCode=#{fromSubInvCode}, + `type`=#{type}, + `allocateStatus`=#{allocateStatus}, + WHERE id = #{id} @@ -160,7 +229,7 @@ INTO thr_order (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, - remark3,invWarehouseCode) + remark3,invWarehouseCode,fromSubInvCode,`type`,allocateStatus) values ( #{id}, #{billNo}, @@ -183,7 +252,10 @@ #{remark1}, #{remark2}, #{remark3}, - #{invWarehouseCode} + #{invWarehouseCode}, + #{fromSubInvCode}, + #{type}, + #{allocateStatus} ) \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml index 1aca37b..e078341 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml @@ -43,7 +43,7 @@ ) - + replace INTO thr_order_detail (productId, productName, spec, batchNo, expireDate, productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime