From c9dde7d7959d8aa249fcdb0eb3ee74d5b1fbfef8 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 19 Sep 2022 17:58:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E8=A1=A8=E5=8D=95=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../udi/admin/controller/TestController.java | 2 +- .../controller/inout/OrderController.java | 37 +++--- .../controller/inout/UdiTraceController.java | 2 +- .../admin/entity/inout/ErpOrderEntity.java | 90 --------------- .../entity/inout/InvProductDetailEntity.java | 42 ++++++- .../admin/entity/inout/InvProductEntity.java | 57 +++++++++- .../admin/entity/inout/OrderDetailEntity.java | 107 ++++++++++++++++++ .../udi/admin/entity/inout/OrderMdEntity.java | 19 +--- .../admin/entity/inout/WarehouseEntity.java | 79 ++++++++++--- .../entity/inout/WarehousetempEntity.java | 80 ++++++++++--- .../udi/admin/mongo/dao/OrderDetailDao.java | 50 ++++---- .../mongo/service/InvProductMdService.java | 4 +- .../mongo/service/OrderDetailMdService.java | 36 +++--- .../admin/mongo/service/OrderMdService.java | 16 +-- .../mongo/service/WarehouseMdService.java | 12 +- .../admin/thread/InvProductsTrService.java | 38 +++---- .../admin/thread/SubmitOrderToSpmsTask.java | 20 ++-- .../udi/admin/thread/TransInoutService.java | 5 +- .../glxp/udi/admin/util/inout/InoutUtils.java | 34 +++--- 19 files changed, 457 insertions(+), 273 deletions(-) delete mode 100644 src/main/java/com/glxp/udi/admin/entity/inout/ErpOrderEntity.java create mode 100644 src/main/java/com/glxp/udi/admin/entity/inout/OrderDetailEntity.java diff --git a/src/main/java/com/glxp/udi/admin/controller/TestController.java b/src/main/java/com/glxp/udi/admin/controller/TestController.java index e3faea6..6169709 100644 --- a/src/main/java/com/glxp/udi/admin/controller/TestController.java +++ b/src/main/java/com/glxp/udi/admin/controller/TestController.java @@ -34,7 +34,7 @@ public class TestController { private String refreshOrderData() { try { //刷新订单详情表的数据 - List erpOrderEntities = orderDetailMdService.filterOrderDetails(new FilterErpOrderRequest()); + List erpOrderEntities = orderDetailMdService.filterOrderDetails(new FilterErpOrderRequest()); /*erpOrderEntities.forEach(orderDetail -> { String orderId = orderDetail.getOrderIdFk(); if (StrUtil.isNotBlank(orderId)) { diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java index 408664a..41c9eaa 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java @@ -328,18 +328,18 @@ public class OrderController { FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); filterErpOrderRequest.setOrderId(orderBean.getOrderId()); //单据详情 - List erpOrderEntities = orderDetailMdService.filterOrderDetails(filterErpOrderRequest); + List erpOrderEntities = orderDetailMdService.filterOrderDetails(filterErpOrderRequest); if (CollUtil.isNotEmpty(erpOrderEntities)) { List orderDetails = new ArrayList<>(); - for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + for (OrderDetailEntity orderDetailEntity : erpOrderEntities) { PostUdimsOrderDetailRequest orderDetail = new PostUdimsOrderDetailRequest(); - orderDetail.setUuidFk(erpOrderEntity.getUuidFk()); - orderDetail.setFirstSalesInvNo(erpOrderEntity.getFirstSalesInvNo()); - orderDetail.setSecSalesInvNo(erpOrderEntity.getSecSalesInvNo()); - orderDetail.setPrice(erpOrderEntity.getPrice()); - orderDetail.setInvoiceDate(erpOrderEntity.getInvoiceDate()); - orderDetail.setSecSalesListNo(erpOrderEntity.getSecSalesListNo()); - orderDetail.setBatchNo(erpOrderEntity.getLotno()); + orderDetail.setUuidFk(orderDetailEntity.getUuidFk()); + orderDetail.setFirstSalesInvNo(orderDetailEntity.getFirstSalesInvNo()); + orderDetail.setSecSalesInvNo(orderDetailEntity.getSecSalesInvNo()); + orderDetail.setPrice(orderDetailEntity.getPrice()); + orderDetail.setInvoiceDate(orderDetailEntity.getInvoiceDate()); + orderDetail.setSecSalesListNo(orderDetailEntity.getSecSalesListNo()); + orderDetail.setBatchNo(orderDetailEntity.getBatchNo()); orderDetails.add(orderDetail); } orderBean.setOrderDetails(orderDetails); @@ -378,11 +378,11 @@ public class OrderController { } filterErpOrderRequest.setPage(1); filterErpOrderRequest.setLimit(100); - List erpOrderEntities = orderDetailMdService.filterOrderDetails(filterErpOrderRequest); + List erpOrderEntities = orderDetailMdService.filterOrderDetails(filterErpOrderRequest); if (CollUtil.isNotEmpty(erpOrderEntities)) { erpOrderEntities.forEach(erpOrderEntity -> { erpOrderEntity.setReCount(erpOrderEntity.getCount()); - erpOrderEntity.setBatchNo(erpOrderEntity.getLotno()); + erpOrderEntity.setBatchNo(erpOrderEntity.getBatchNo()); }); } return ResultVOUtils.success(erpOrderEntities); @@ -391,14 +391,14 @@ public class OrderController { /** * 更新单据详情信息 * - * @param erpOrderEntity + * @param orderDetailEntity * @return */ @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/order/detail/update") - public BaseResponse updateStockOrderDetail(ErpOrderEntity erpOrderEntity) { - if (null != erpOrderEntity) { - orderDetailMdService.updateOrderDetail(erpOrderEntity); + public BaseResponse updateStockOrderDetail(OrderDetailEntity orderDetailEntity) { + if (null != orderDetailEntity) { + orderDetailMdService.updateOrderDetail(orderDetailEntity); } return ResultVOUtils.success("更新成功"); } @@ -479,10 +479,7 @@ public class OrderController { //查询条码 List originCodes = warehouseMdService.findByOrderId(originOrder.getOrderId()); originOrder.setActDate(cn.hutool.core.date.DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN)); - originOrder.setCreateTime(originOrder.getActDate()); originOrder.setFromCorp(addOrderChangeRequest.getFromCorp()); - originOrder.setInvWarehouseCode(addOrderChangeRequest.getInvWarehouseCode()); - originOrder.setInvStorageCode(addOrderChangeRequest.getLocStorageCode()); originOrder.setFromCorpId(addOrderChangeRequest.getFromCorpId()); originOrder.setCorpOrderId(CustomUtil.getId() + "x"); originOrder.setMainAction(addOrderChangeRequest.getMainAction()); @@ -490,7 +487,6 @@ public class OrderController { originOrder.setExportStatus("0"); //设置导出状态为未导出 originOrder.setReceiveStatus(ConstantStatus.RECEIVE_UN); //设置验收状态为未验收 originOrder.setStatus(ConstantStatus.ORDER_STATUS_WAIT); //单据状态修改为待处理 - originOrder.setErpFk(null);//关联业务单据置空 originOrder.setLocStorageCode(addOrderChangeRequest.getLocStorageCode()); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(originOrder.getAction(), addOrderChangeRequest.getCustomerId()); String supplementOrderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); @@ -509,7 +505,7 @@ public class OrderController { code -> { //复制选中的产品 for (WarehouseEntity product : products) { - if (product.getNameCode().equals(code.getUdi())) { + if (product.getNameCode().equals(code.getNameCode())) { if ((StrUtil.isNotBlank(product.getBatchNo()) && StrUtil.isNotBlank(code.getBatchNo()) && product.getBatchNo().equals(code.getBatchNo())) || (StrUtil.isBlank(product.getBatchNo()) && StrUtil.isBlank(code.getBatchNo()))) { WarehousetempEntity supplementCode = new WarehousetempEntity(); @@ -517,7 +513,6 @@ public class OrderController { supplementCode.setFromCorpId(originOrder.getFromCorpId()); supplementCode.setFromCorp(originOrder.getFromCorp()); supplementCode.setLocStorageCode(originOrder.getLocStorageCode()); - supplementCode.setInvWarehouseCode(originOrder.getInvWarehouseCode()); supplementCode.setOrderId(supplementOrderNo); //查询补单设置 supplementCode.setAction(originOrder.getAction()); diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java b/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java index f2a8770..8dfae36 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java @@ -146,7 +146,7 @@ public class UdiTraceController { orderMdEntities.addAll(set); if (CollUtil.isNotEmpty(orderMdEntities)) { //根据时间排序 - orderMdEntities = orderMdEntities.stream().sorted(Comparator.comparing(OrderMdEntity::getActDate, Comparator.reverseOrder())).collect(Collectors.toList()); + orderMdEntities = orderMdEntities.stream().sorted(Comparator.comparing(OrderMdEntity::getActDate)).collect(Collectors.toList()); } Page pageResult = new Page<>(warehouseQueryRequest.getPage(), warehouseQueryRequest.getLimit()); diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/ErpOrderEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/ErpOrderEntity.java deleted file mode 100644 index 86859c6..0000000 --- a/src/main/java/com/glxp/udi/admin/entity/inout/ErpOrderEntity.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.glxp.udi.admin.entity.inout; - -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class ErpOrderEntity { - - private String id; - - private String companyid; - - private String docid; - - private String iodtlid; - - private String inoutid; - - private String goodsunit; - - private String goodsid; - - private String lotid; - - private String goodsname; - - private String companyname; - - private String lotno; //批次号 - - private Integer dtlgoodsqty; - - private String credate; - - private Integer reCount; - - private String uuidFk; - - private String nameCode; - - private String productCompany; - - private String coName; - - private String produceDate; - - private String expireDate; - - private String authCode; - - private String batchNo; - - private String packSpec; - - private String packRatio; - - private Integer bhzxxsbzsl; - - private Integer zxxsbzbhsydysl; - - private String isDownload; - - private String orderIdFk; - - private Integer count; - - private String nameCodes; - - private String status; - - //价格 - private BigDecimal price; - - //销售发票号（第一票） - private String firstSalesInvNo; - - //销售发票号（第二票） - private String secSalesInvNo; - - //销售清单号（第二票） - private String secSalesListNo; - - //开票日期 - private String invoiceDate; - - //产品编码 - private String relId; - -} diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/InvProductDetailEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/InvProductDetailEntity.java index 32acc77..2ca3e2e 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/InvProductDetailEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/InvProductDetailEntity.java @@ -10,32 +10,70 @@ public class InvProductDetailEntity { private String id; + /** + * 码 + */ private String code; + /** + * 产品ID + */ private String productIdFk; + /** + * 单据ID + */ private String orderIdFk; + /** + * 客户ID + */ private String customerId; + /** + * 主业务类型 + */ private String mainAction; + /** + * 单据类型 + */ private String action; + /** + * 数量 + */ private Integer count; + /** + * 更新时间 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; + /** + * 批次号 + */ private String batchNo; - private String productionDate; + /** + * 生产日期 + */ + private String productDate; + /** + * 过期时间 + */ private String expireDate; + /** + * 库存ID外键 + */ private String invProductIdFk; - //仓库码 + /** + * 仓库码 + */ private String locStorageCode; } diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/InvProductEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/InvProductEntity.java index 35cd316..7d6c455 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/InvProductEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/InvProductEntity.java @@ -7,42 +7,89 @@ public class InvProductEntity { private String id; + /** + * 产品名称 + */ private String productsName; + /** + * 最小销售标识 + */ private String nameCode; + /** + * 产品ID + */ private String relIdFk; + /** + * 规格型号 + */ private String ggxh; + /** + * 批次号 + */ private String batchNo; - private String productionDate; + /** + * 生产日期 + */ + private String productDate; + /** + * 过期时间 + */ private String expireDate; + /** + * 医疗器械注册备案人名称 + */ private String ylqxzcrbarmc; + /** + * 注册证编号/备案批准编号 + */ private String zczbhhzbapzbh; + /** + * 入库数量 + */ private Integer inCount; + /** + * 出库数量 + */ private Integer outCount; + /** + * 剩余实际数量 + */ private Integer reCount; + /** + * 客户ID + */ private String customerId; + /** + * 供应商ID + */ private String supId; + /** + * 往来单位 + */ private String unitFk; - private String invWarehouseCode; - - //生产厂家 + /** + * 生产厂家 + */ private String manufactory; - //仓库码 + /** + * 仓库码 + */ private String locStorageCode; public Integer getInCount() { diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/OrderDetailEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/OrderDetailEntity.java new file mode 100644 index 0000000..65cd724 --- /dev/null +++ b/src/main/java/com/glxp/udi/admin/entity/inout/OrderDetailEntity.java @@ -0,0 +1,107 @@ +package com.glxp.udi.admin.entity.inout; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class OrderDetailEntity { + + private String id; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 产品编码 + */ + private String relId; + + /** + * 应收数量 + */ + private Integer reCount; + + /** + * 产品UUID + */ + private String uuidFk; + + /** + * 最小销售标识 + */ + private String nameCode; + + /** + * 生产厂家 + */ + private String productCompany; + + /** + * 产品名称 + */ + private String productName; + + /** + * 生产日期 + */ + private String produceDate; + + /** + * 过期时间 + */ + private String expireDate; + + /** + * 注册证/备案号 + */ + private String zczbhhzbapzbh; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 包装级别 + */ + private String packRatio; + + /** + * 关联单据号 + */ + private String orderIdFk; + + /** + * 订单该产品实际数量 + */ + private Integer count; + + /** + * 价格 + */ + private BigDecimal price; + + /** + * 销售发票号（第一票） + */ + private String firstSalesInvNo; + + /** + * 销售发票号（第二票） + */ + private String secSalesInvNo; + + /** + * 销售清单号（第二票） + */ + private String secSalesListNo; + + /** + * 开票日期 + */ + private String invoiceDate; + +} diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/OrderMdEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/OrderMdEntity.java index be38610..2020ce5 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/OrderMdEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/OrderMdEntity.java @@ -34,26 +34,22 @@ public class OrderMdEntity { private String remark; + /** + * 导出状态 + */ private String exportStatus; private String fromType; - private String contrastStatus; - - private String erpFk; - + /** + * 上传到自助平台状态 + */ private String uploadStatus; //上传状态（0：未上传，1：已上传） private Long customerId; - private String invStorageCode; - - private String invWarehouseCode; - private String locStorageCode; - private String nameCode; //最小销售标识 - //复制单号，多个单号之间使用英文逗号,分隔 private String replicateNo; @@ -68,9 +64,6 @@ public class OrderMdEntity { //单据更新时间 private Date updateTime; - //单据创建时间 - private String createTime; - public void setActDate(String actDate) { if (StrUtil.isNotBlank(actDate)) { actDate = DateUtil.parse(actDate).toString(DatePattern.NORM_DATETIME_PATTERN); diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseEntity.java index 76a4038..807295f 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseEntity.java @@ -7,62 +7,111 @@ public class WarehouseEntity { private String id; + /** + * 单据类型 + */ private String action; + /** + * 主业务类型 + */ private String mainAction; + /** + * 码 + */ private String code; + /** + * 单据流水号 + */ private String corpOrderId; + /** + * 创建人 + */ private String actor; + /** + * 创建时间 + */ private String actDate; + /** + * 往来单位ID + */ private String fromCorpId; + /** + * 往来单位名称 + */ private String fromCorp; + /** + * 单据号 + */ private String orderId; + /** + * 批次号 + */ private String batchNo; + /** + * 生产日期 + */ private String produceDate; + /** + * 过期时间 + */ private String expireDate; + /** + * 序列号 + */ private String serialNo; + /** + * 实际数量 + */ private Integer count; + /** + * 包装等级 + */ private String packageLevel; - private String warehouseCode; - + /** + * 客户ID + */ private String customerId; + /** + * 最小销售标识 + */ private String nameCode; - private String supId;//供应商ID + /** + * 供应商ID + */ + private String supId; + /** + * 供应商名称 + */ private String supName; - private String invStorageCode; - - private String invWarehouseCode; - + /** + * 产品ID + */ private String relId; - private Integer status; - + /** + * 仓库码 + */ private String locStorageCode; - private String udi; - - public String getSupId() { - return supId; - } - public Integer getCount() { if (count == null) { return 1; diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempEntity.java index 54d9275..562a516 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempEntity.java @@ -5,58 +5,106 @@ import lombok.Data; @Data public class WarehousetempEntity { + private String id; + + /** + * 单据类型 + */ private String action; + /** + * 主业务类型 + */ private String mainAction; + /** + * 码 + */ private String code; + /** + * 单据流水号 + */ private String corpOrderId; + /** + * 创建人 + */ private String actor; + /** + * 创建时间 + */ private String actDate; - private Integer wrongCode; - - private String upperCorpOrderId; - + /** + * 往来单位ID + */ private String fromCorpId; - private String id; - + /** + * 往来单位名称 + */ private String fromCorp; + /** + * 单据ID + */ private String orderId; + /** + * 批次号 + */ private String batchNo; + /** + * 生产日期 + */ private String produceDate; + /** + * 过期时间 + */ private String expireDate; + /** + * 序列号 + */ private String serialNo; - private String udi; + /** + * 最小销售标识 + */ + private String nameCode; + /** + * 扫码数量 + */ private Integer count; - private Integer type; - + /** + * 客户ID + */ private Long customerId; - private String invStorageCode; - - private String invWarehouseCode; - + /** + * 状态 + */ private Integer status; + /** + * 仓库码 + */ private String locStorageCode; - private String nameCode; //最小销售标识 - + /** + * 产品ID + */ private String relId; - private String supId;//供应商ID + /** + * 供应商ID + */ + private String supId; } diff --git a/src/main/java/com/glxp/udi/admin/mongo/dao/OrderDetailDao.java b/src/main/java/com/glxp/udi/admin/mongo/dao/OrderDetailDao.java index 6a5fdb2..ef0eb2d 100644 --- a/src/main/java/com/glxp/udi/admin/mongo/dao/OrderDetailDao.java +++ b/src/main/java/com/glxp/udi/admin/mongo/dao/OrderDetailDao.java @@ -2,7 +2,7 @@ package com.glxp.udi.admin.mongo.dao; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; -import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.entity.inout.OrderDetailEntity; import com.glxp.udi.admin.mongo.MongoDBName; import com.glxp.udi.admin.mongo.dao.base.MongoBaseDao; import com.glxp.udi.admin.mongo.utils.MongoPageHelper; @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.List; @Component -public class OrderDetailDao implements MongoBaseDao { +public class OrderDetailDao implements MongoBaseDao { @Resource private MongoTemplate mongoTemplate; @@ -29,38 +29,38 @@ public class OrderDetailDao implements MongoBaseDao pageQuery(Query query, FilterErpOrderRequest filterErpOrderRequest, int page, int size) { + public PageResult pageQuery(Query query, FilterErpOrderRequest filterErpOrderRequest, int page, int size) { if (null == query && null != filterErpOrderRequest) { query = buildQuery(filterErpOrderRequest); } - return mongoPageHelper.pageQuery(query, ErpOrderEntity.class, size, page, MongoDBName.NAME_ORDER_DETAIL); + return mongoPageHelper.pageQuery(query, OrderDetailEntity.class, size, page, MongoDBName.NAME_ORDER_DETAIL); } @Override - public List findList(Query query, FilterErpOrderRequest filterErpOrderRequest) { + public List findList(Query query, FilterErpOrderRequest filterErpOrderRequest) { if (null == query && null != filterErpOrderRequest) { query = buildQuery(filterErpOrderRequest); } - return mongoTemplate.find(query, ErpOrderEntity.class, MongoDBName.NAME_ORDER_DETAIL); + return mongoTemplate.find(query, OrderDetailEntity.class, MongoDBName.NAME_ORDER_DETAIL); } @Override - public ErpOrderEntity findOne(Query query, FilterErpOrderRequest filterErpOrderRequest) { + public OrderDetailEntity findOne(Query query, FilterErpOrderRequest filterErpOrderRequest) { if (null == query && null != filterErpOrderRequest) { query = buildQuery(filterErpOrderRequest); } - return mongoTemplate.findOne(query, ErpOrderEntity.class, MongoDBName.NAME_ORDER_DETAIL); + return mongoTemplate.findOne(query, OrderDetailEntity.class, MongoDBName.NAME_ORDER_DETAIL); } @Override - public void update(Query query, Update update, ErpOrderEntity erpOrderEntity) { + public void update(Query query, Update update, OrderDetailEntity orderDetailEntity) { if (null == query) { - query = buildQuery(erpOrderEntity); + query = buildQuery(orderDetailEntity); } if (null == update) { - update = buildUpdate(erpOrderEntity); + update = buildUpdate(orderDetailEntity); } - mongoTemplate.updateMulti(query, update, ErpOrderEntity.class, MongoDBName.NAME_ORDER_DETAIL); + mongoTemplate.updateMulti(query, update, OrderDetailEntity.class, MongoDBName.NAME_ORDER_DETAIL); } @Override @@ -68,7 +68,7 @@ public class OrderDetailDao implements MongoBaseDao records) { + public void insert(List records) { mongoTemplate.insert(records, MongoDBName.NAME_ORDER_DETAIL); } @@ -115,14 +115,14 @@ public class OrderDetailDao implements MongoBaseDao { - Object fieldValue = ReflectUtil.getFieldValue(erpOrderEntity, field); + Object fieldValue = ReflectUtil.getFieldValue(orderDetailEntity, field); if (ObjectUtil.isNotEmpty(fieldValue)) { if ("orderId".equals(field.getName())) { query.addCriteria(Criteria.where("orderIdFk").is(fieldValue)); @@ -137,14 +137,14 @@ public class OrderDetailDao implements MongoBaseDao { - Object fieldValue = ReflectUtil.getFieldValue(erpOrderEntity, field); + Object fieldValue = ReflectUtil.getFieldValue(orderDetailEntity, field); if (ObjectUtil.isNotEmpty(fieldValue)) { if (!"orderId".equals(field.getName()) && !"orderIdFk".equals(field.getName())) { update.set(field.getName(), fieldValue); diff --git a/src/main/java/com/glxp/udi/admin/mongo/service/InvProductMdService.java b/src/main/java/com/glxp/udi/admin/mongo/service/InvProductMdService.java index 2563e8d..24f4a20 100644 --- a/src/main/java/com/glxp/udi/admin/mongo/service/InvProductMdService.java +++ b/src/main/java/com/glxp/udi/admin/mongo/service/InvProductMdService.java @@ -161,8 +161,8 @@ public class InvProductMdService { if (invProductEntity.getBatchNo() != null) { update.set("batchNo", invProductEntity.getBatchNo()); } - if (invProductEntity.getProductionDate() != null) { - update.set("productionDate", invProductEntity.getProductionDate()); + if (invProductEntity.getProductDate() != null) { + update.set("productionDate", invProductEntity.getProductDate()); } if (invProductEntity.getExpireDate() != null) { update.set("expireDate", invProductEntity.getExpireDate()); diff --git a/src/main/java/com/glxp/udi/admin/mongo/service/OrderDetailMdService.java b/src/main/java/com/glxp/udi/admin/mongo/service/OrderDetailMdService.java index b2cb614..7683ab9 100644 --- a/src/main/java/com/glxp/udi/admin/mongo/service/OrderDetailMdService.java +++ b/src/main/java/com/glxp/udi/admin/mongo/service/OrderDetailMdService.java @@ -1,7 +1,7 @@ package com.glxp.udi.admin.mongo.service; import cn.hutool.core.util.StrUtil; -import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.entity.inout.OrderDetailEntity; import com.glxp.udi.admin.mongo.MongoDBName; import com.glxp.udi.admin.req.inout.DeleteRequest; import com.glxp.udi.admin.req.inout.FilterErpOrderRequest; @@ -22,7 +22,7 @@ public class OrderDetailMdService { @Resource private MongoTemplate mongoTemplate; - public List filterOrderDetails(FilterErpOrderRequest filterErpOrderRequest) { + public List filterOrderDetails(FilterErpOrderRequest filterErpOrderRequest) { Query query = new Query(); if (filterErpOrderRequest.getOrderId() != null && !filterErpOrderRequest.getOrderId().isEmpty()) { query.addCriteria(Criteria.where("orderIdFk").is(filterErpOrderRequest.getOrderId())); @@ -39,12 +39,12 @@ public class OrderDetailMdService { if (StrUtil.isNotBlank(filterErpOrderRequest.getLotno())) { query.addCriteria(Criteria.where("lotno").is(filterErpOrderRequest.getLotno())); } - return mongoTemplate.find(query, ErpOrderEntity.class, MongoDBName.NAME_ORDER_DETAIL); + return mongoTemplate.find(query, OrderDetailEntity.class, MongoDBName.NAME_ORDER_DETAIL); } - public void insertOrderDetail(List erpOrderEntities) { + public void insertOrderDetail(List erpOrderEntities) { if (erpOrderEntities != null) { - Collection warehouseEntityCollection = new ArrayList<>(); + Collection warehouseEntityCollection = new ArrayList<>(); warehouseEntityCollection.addAll(erpOrderEntities); mongoTemplate.insert(warehouseEntityCollection, MongoDBName.NAME_ORDER_DETAIL); } @@ -58,28 +58,28 @@ public class OrderDetailMdService { if (deleteRequest.getOrderId() != null) { query.addCriteria(Criteria.where("orderIdFk").is(deleteRequest.getOrderId())); } - mongoTemplate.remove(query, ErpOrderEntity.class, MongoDBName.NAME_ORDER_DETAIL); + mongoTemplate.remove(query, OrderDetailEntity.class, MongoDBName.NAME_ORDER_DETAIL); } - public void updateOrderDetail(ErpOrderEntity erpOrderEntity) { + public void updateOrderDetail(OrderDetailEntity orderDetailEntity) { Query query = new Query(); - query.addCriteria(new Criteria().and("_id").is(erpOrderEntity.getId())); + query.addCriteria(new Criteria().and("_id").is(orderDetailEntity.getId())); Update update = new Update(); - if (erpOrderEntity.getCount() != null) { - update.set("count", erpOrderEntity.getCount()); + if (orderDetailEntity.getCount() != null) { + update.set("count", orderDetailEntity.getCount()); } - if (erpOrderEntity.getReCount() != null) { - update.set("reCount", erpOrderEntity.getReCount()); + if (orderDetailEntity.getReCount() != null) { + update.set("reCount", orderDetailEntity.getReCount()); } //更新发票号等字段 - update.set("firstSalesInvNo", erpOrderEntity.getFirstSalesInvNo()); - update.set("secSalesInvNo", erpOrderEntity.getSecSalesInvNo()); - update.set("secSalesListNo", erpOrderEntity.getSecSalesListNo()); - update.set("invoiceDate", erpOrderEntity.getInvoiceDate()); - if (null != erpOrderEntity.getPrice()) { - update.set("price", erpOrderEntity.getPrice()); + update.set("firstSalesInvNo", orderDetailEntity.getFirstSalesInvNo()); + update.set("secSalesInvNo", orderDetailEntity.getSecSalesInvNo()); + update.set("secSalesListNo", orderDetailEntity.getSecSalesListNo()); + update.set("invoiceDate", orderDetailEntity.getInvoiceDate()); + if (null != orderDetailEntity.getPrice()) { + update.set("price", orderDetailEntity.getPrice()); } mongoTemplate.updateMulti(query, update, MongoDBName.NAME_ORDER_DETAIL); diff --git a/src/main/java/com/glxp/udi/admin/mongo/service/OrderMdService.java b/src/main/java/com/glxp/udi/admin/mongo/service/OrderMdService.java index 339dad2..0c8701a 100644 --- a/src/main/java/com/glxp/udi/admin/mongo/service/OrderMdService.java +++ b/src/main/java/com/glxp/udi/admin/mongo/service/OrderMdService.java @@ -307,13 +307,13 @@ public class OrderMdService { FilterErpOrderRequest detailRequest = new FilterErpOrderRequest(); detailRequest.setOrderId(orderId); - List erpOrderEntities = orderDetailMdService.filterOrderDetails(detailRequest); + List erpOrderEntities = orderDetailMdService.filterOrderDetails(detailRequest); CustomerInfoEntity customerInfoEntity = customerInfoDao.selectById(orderMdEntity.getCustomerId()); String customerId = String.valueOf(customerInfoEntity.getCustomerId()); erpOrderEntities.forEach(erpOrderEntity -> { //查询产品批次 StockOrderPrintEntity printEntity = new StockOrderPrintEntity(); - printEntity.setBatchNo(erpOrderEntity.getLotno()); //批次号 + printEntity.setBatchNo(erpOrderEntity.getBatchNo()); //批次号 printEntity.setProductId(erpOrderEntity.getNameCode()); //产品ID printEntity.setCorpId(customerId); //本企业ID printEntity.setCorpName(orderMdEntity.getFromCorp()); //往来单位名称 @@ -323,12 +323,12 @@ public class OrderMdService { printEntity.setPrice(erpOrderEntity.getPrice());//金额 printEntity.setBillNo(orderMdEntity.getOrderId()); //单号 printEntity.setBilldate(orderMdEntity.getActDate()); //单据日期 - printEntity.setZczbhhzbapzbh(erpOrderEntity.getAuthCode()); //注册/备案证号 - printEntity.setSpec(erpOrderEntity.getPackSpec()); //规格型号 + printEntity.setZczbhhzbapzbh(erpOrderEntity.getZczbhhzbapzbh()); //注册/备案证号 + printEntity.setSpec(erpOrderEntity.getGgxh()); //规格型号 printEntity.setTitle(customerInfoEntity.getCompanyName()); //企业名称，单据抬头 //查询仓库名称 FilterInvProductRequest invProductRequest = new FilterInvProductRequest(); - invProductRequest.setBatchNo(erpOrderEntity.getLotno()); + invProductRequest.setBatchNo(erpOrderEntity.getBatchNo()); invProductRequest.setRelIdFk(erpOrderEntity.getUuidFk()); invProductRequest.setCustomerId(customerId); invProductRequest.setInvCodes(Arrays.asList(orderMdEntity.getLocStorageCode())); @@ -337,7 +337,7 @@ public class OrderMdService { UdiInfoEntity udiInfoEntity = udiInfoDao.findByUuid(erpOrderEntity.getUuidFk(), String.valueOf(orderMdEntity.getCustomerId())); printEntity.setManufactory(udiInfoEntity.getManufactory()); //生产厂家 printEntity.setLocInv(invWarehouseDao.getNameByCode(orderMdEntity.getLocStorageCode())); - printEntity.setProductName(erpOrderEntity.getCoName()); //产品名称 + printEntity.setProductName(erpOrderEntity.getProductName()); //产品名称 printEntity.setProductDate(erpOrderEntity.getProduceDate()); //生产日期 printEntity.setExpireDate(erpOrderEntity.getExpireDate()); //失效日期 list.add(printEntity); @@ -554,7 +554,7 @@ public class OrderMdService { //删除码详情 mongoTemplate.remove(queryOrder, WarehouseEntity.class, MongoDBName.NAME_CODE); //删除单据详情 - mongoTemplate.remove(queryInvDetail, ErpOrderEntity.class, MongoDBName.NAME_ORDER_DETAIL); + mongoTemplate.remove(queryInvDetail, OrderDetailEntity.class, MongoDBName.NAME_ORDER_DETAIL); //删除单据 mongoTemplate.remove(queryOrder, OrderMdEntity.class, MongoDBName.NAME_ORDER); } catch (Exception e) { @@ -568,7 +568,7 @@ public class OrderMdService { mongoTemplate.remove(queryOrder, OrderMdEntity.class, MongoDBName.NAME_ORDER); //删除单据详情 Query queryOrderDetail = Query.query(Criteria.where("orderIdFk").is(id)); - mongoTemplate.remove(queryOrderDetail, ErpOrderEntity.class, MongoDBName.NAME_ORDER_DETAIL); + mongoTemplate.remove(queryOrderDetail, OrderDetailEntity.class, MongoDBName.NAME_ORDER_DETAIL); //删除临时码表 mongoTemplate.remove(queryOrder, WarehouseEntity.class, MongoDBName.NAME_CODE_TEMP); } catch (Exception e) { diff --git a/src/main/java/com/glxp/udi/admin/mongo/service/WarehouseMdService.java b/src/main/java/com/glxp/udi/admin/mongo/service/WarehouseMdService.java index d1b0d89..e83eec0 100644 --- a/src/main/java/com/glxp/udi/admin/mongo/service/WarehouseMdService.java +++ b/src/main/java/com/glxp/udi/admin/mongo/service/WarehouseMdService.java @@ -211,17 +211,17 @@ public class WarehouseMdService { filterErpOrderRequest.setOrderIdFk(order.getOrderId()); filterErpOrderRequest.setUuidFk(invProductEntity.getRelIdFk()); filterErpOrderRequest.setLotno(warehouseEntity.getBatchNo()); - List erpOrderEntities = orderDetailMdService.filterOrderDetails(filterErpOrderRequest); + List erpOrderEntities = orderDetailMdService.filterOrderDetails(filterErpOrderRequest); if (CollUtil.isNotEmpty(erpOrderEntities)) { - ErpOrderEntity erpOrderEntity = erpOrderEntities.get(0); - if (erpOrderEntity.getCount() > 1) { - erpOrderEntity.setCount(erpOrderEntity.getCount() - 1); + OrderDetailEntity orderDetailEntity = erpOrderEntities.get(0); + if (orderDetailEntity.getCount() > 1) { + orderDetailEntity.setCount(orderDetailEntity.getCount() - 1); //更新单据详情 - orderDetailMdService.updateOrderDetail(erpOrderEntity); + orderDetailMdService.updateOrderDetail(orderDetailEntity); } else { //删除扫码单据详情 DeleteRequest deleteRequest = new DeleteRequest(); - deleteRequest.setId(erpOrderEntity.getId()); + deleteRequest.setId(orderDetailEntity.getId()); orderDetailMdService.deleteOrderDetail(deleteRequest); } } diff --git a/src/main/java/com/glxp/udi/admin/thread/InvProductsTrService.java b/src/main/java/com/glxp/udi/admin/thread/InvProductsTrService.java index e113311..20d0bad 100644 --- a/src/main/java/com/glxp/udi/admin/thread/InvProductsTrService.java +++ b/src/main/java/com/glxp/udi/admin/thread/InvProductsTrService.java @@ -57,40 +57,40 @@ public class InvProductsTrService { if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_SUCCESS)) { FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); filterErpOrderRequest.setOrderId(orderId); - List erpOrderEntities = myErpOrderService.filterOrderDetails(filterErpOrderRequest); + List erpOrderEntities = myErpOrderService.filterOrderDetails(filterErpOrderRequest); if (erpOrderEntities != null && erpOrderEntities.size() > 0) { - for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { - String nameCode = erpOrderEntity.getNameCode(); + for (OrderDetailEntity orderDetailEntity : erpOrderEntities) { + String nameCode = orderDetailEntity.getNameCode(); UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(nameCode, customerId); - InvProductEntity invProductEntity = invProductService.selectByUuid(udiInfoEntity.getUuid(), erpOrderEntity.getLotno(), orderEntity.getCustomerId() + "", orderEntity.getLocStorageCode()); + InvProductEntity invProductEntity = invProductService.selectByUuid(udiInfoEntity.getUuid(), orderDetailEntity.getBatchNo(), orderEntity.getCustomerId() + "", orderEntity.getLocStorageCode()); if (invProductEntity == null) { invProductEntity = new InvProductEntity(); invProductEntity.setRelIdFk(String.valueOf(udiInfoEntity.getId())); - invProductEntity.setBatchNo(erpOrderEntity.getLotno()); + invProductEntity.setBatchNo(orderDetailEntity.getBatchNo()); invProductEntity.setCustomerId(orderEntity.getCustomerId() + ""); - invProductEntity.setExpireDate(erpOrderEntity.getExpireDate()); - invProductEntity.setProductionDate(erpOrderEntity.getProduceDate()); - invProductEntity.setGgxh(erpOrderEntity.getPackSpec()); - invProductEntity.setNameCode(erpOrderEntity.getNameCode()); - invProductEntity.setProductsName(erpOrderEntity.getCoName()); - invProductEntity.setYlqxzcrbarmc(erpOrderEntity.getProductCompany()); - invProductEntity.setZczbhhzbapzbh(erpOrderEntity.getAuthCode()); + invProductEntity.setExpireDate(orderDetailEntity.getExpireDate()); + invProductEntity.setProductDate(orderDetailEntity.getProduceDate()); + invProductEntity.setGgxh(orderDetailEntity.getGgxh()); + invProductEntity.setNameCode(orderDetailEntity.getNameCode()); + invProductEntity.setProductsName(orderDetailEntity.getProductName()); + invProductEntity.setYlqxzcrbarmc(orderDetailEntity.getProductCompany()); + invProductEntity.setZczbhhzbapzbh(orderDetailEntity.getZczbhhzbapzbh()); invProductEntity.setLocStorageCode(orderEntity.getLocStorageCode()); invProductEntity.setManufactory(udiInfoEntity.getManufactory()); if (orderEntity.getMainAction().equals(TypeConstant.TYPE_OUT)) { - invProductEntity.setOutCount(erpOrderEntity.getCount()); + invProductEntity.setOutCount(orderDetailEntity.getCount()); invProductEntity.setInCount(0); } else if (orderEntity.getMainAction().equals(TypeConstant.TYPE_PUT)) { - invProductEntity.setInCount(erpOrderEntity.getCount()); + invProductEntity.setInCount(orderDetailEntity.getCount()); invProductEntity.setOutCount(0); } invProductService.insertInvProduct(invProductEntity); invProductEntity = invProductService.selectByUuid(invProductEntity.getRelIdFk(), invProductEntity.getBatchNo(), orderEntity.getCustomerId() + "", orderEntity.getLocStorageCode()); } else { if (orderEntity.getMainAction().equals(TypeConstant.TYPE_OUT)) { - invProductEntity.setOutCount(invProductEntity.getOutCount() + erpOrderEntity.getCount()); + invProductEntity.setOutCount(invProductEntity.getOutCount() + orderDetailEntity.getCount()); } else if (orderEntity.getMainAction().equals(TypeConstant.TYPE_PUT)) { - invProductEntity.setInCount(invProductEntity.getInCount() + erpOrderEntity.getCount()); + invProductEntity.setInCount(invProductEntity.getInCount() + orderDetailEntity.getCount()); } invProductService.updateInvProduct(invProductEntity); } @@ -105,8 +105,8 @@ public class InvProductsTrService { List warehouseEntities = codesService.filterWarehouse(warehouseQueryRequest); if (CollUtil.isNotEmpty(warehouseEntities)) { for (WarehouseEntity warehouseEntity : warehouseEntities) { - UdiInfoEntity tempUdi = udiInfoService.findByNameCode(warehouseEntity.getUdi(), customerId); - if (tempUdi.getUuid().equals(erpOrderEntity.getUuidFk())) { + UdiInfoEntity tempUdi = udiInfoService.findByNameCode(warehouseEntity.getNameCode(), customerId); + if (tempUdi.getUuid().equals(orderDetailEntity.getUuidFk())) { InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); invProductDetailEntity.setProductIdFk(invProductEntity.getRelIdFk() + ""); invProductDetailEntity.setInvProductIdFk(String.valueOf(invProductEntity.getId())); @@ -117,7 +117,7 @@ public class InvProductsTrService { invProductDetailEntity.setAction(warehouseEntity.getAction()); invProductDetailEntity.setBatchNo(warehouseEntity.getBatchNo()); invProductDetailEntity.setMainAction(warehouseEntity.getMainAction()); - invProductDetailEntity.setProductionDate(warehouseEntity.getProduceDate()); + invProductDetailEntity.setProductDate(warehouseEntity.getProduceDate()); invProductDetailEntity.setExpireDate(warehouseEntity.getExpireDate()); invProductDetailEntity.setUpdateTime(new Date()); invProductDetailEntity.setCustomerId(orderEntity.getCustomerId() + ""); diff --git a/src/main/java/com/glxp/udi/admin/thread/SubmitOrderToSpmsTask.java b/src/main/java/com/glxp/udi/admin/thread/SubmitOrderToSpmsTask.java index 25acaca..d5acfba 100644 --- a/src/main/java/com/glxp/udi/admin/thread/SubmitOrderToSpmsTask.java +++ b/src/main/java/com/glxp/udi/admin/thread/SubmitOrderToSpmsTask.java @@ -11,7 +11,7 @@ import com.glxp.udi.admin.constant.SystemParamConstant; import com.glxp.udi.admin.dao.info.ScheduledDao; import com.glxp.udi.admin.entity.info.PlatformEntity; import com.glxp.udi.admin.entity.info.ScheduledEntity; -import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.entity.inout.OrderDetailEntity; import com.glxp.udi.admin.entity.inout.OrderMdEntity; import com.glxp.udi.admin.entity.inout.UnitMaintainEntity; import com.glxp.udi.admin.entity.inout.WarehouseEntity; @@ -116,18 +116,18 @@ public class SubmitOrderToSpmsTask implements SchedulingConfigurer { FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); filterErpOrderRequest.setOrderId(orderBean.getOrderId()); //单据详情 - List erpOrderEntities = orderDetailMdService.filterOrderDetails(filterErpOrderRequest); + List erpOrderEntities = orderDetailMdService.filterOrderDetails(filterErpOrderRequest); if (CollUtil.isNotEmpty(erpOrderEntities)) { List orderDetails = new ArrayList<>(); - for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + for (OrderDetailEntity orderDetailEntity : erpOrderEntities) { PostUdimsOrderDetailRequest orderDetail = new PostUdimsOrderDetailRequest(); - orderDetail.setUuidFk(erpOrderEntity.getUuidFk()); - orderDetail.setFirstSalesInvNo(erpOrderEntity.getFirstSalesInvNo()); - orderDetail.setSecSalesInvNo(erpOrderEntity.getSecSalesInvNo()); - orderDetail.setPrice(erpOrderEntity.getPrice()); - orderDetail.setInvoiceDate(erpOrderEntity.getInvoiceDate()); - orderDetail.setSecSalesListNo(erpOrderEntity.getSecSalesListNo()); - orderDetail.setBatchNo(erpOrderEntity.getLotno()); + orderDetail.setUuidFk(orderDetailEntity.getUuidFk()); + orderDetail.setFirstSalesInvNo(orderDetailEntity.getFirstSalesInvNo()); + orderDetail.setSecSalesInvNo(orderDetailEntity.getSecSalesInvNo()); + orderDetail.setPrice(orderDetailEntity.getPrice()); + orderDetail.setInvoiceDate(orderDetailEntity.getInvoiceDate()); + orderDetail.setSecSalesListNo(orderDetailEntity.getSecSalesListNo()); + orderDetail.setBatchNo(orderDetailEntity.getBatchNo()); orderDetails.add(orderDetail); } orderBean.setOrderDetails(orderDetails); diff --git a/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java b/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java index d5f1452..0c4bce3 100644 --- a/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java +++ b/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java @@ -146,7 +146,7 @@ public class TransInoutService { } //产品是否可以使用单元入库 - UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(warehousetemp.getUdi(), String.valueOf(warehousetemp.getCustomerId())); + UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(warehousetemp.getNameCode(), String.valueOf(warehousetemp.getCustomerId())); if (null != udiInfoEntity) { if (udiInfoEntity.getIsUseDy() == 0 && udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY) { tempEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL); @@ -217,9 +217,6 @@ public class TransInoutService { orderSaveRequest.setExportStatus("未上传"); orderSaveRequest.setUploadStatus("0"); //上传状态，未上传 orderSaveRequest.setLocStorageCode(warehousetempEntity.getLocStorageCode()); - orderSaveRequest.setInvStorageCode(warehousetempEntity.getInvStorageCode()); - orderSaveRequest.setInvWarehouseCode(warehousetempEntity.getInvWarehouseCode()); - orderSaveRequest.setNameCode(warehousetempEntity.getNameCode()); //查询此类型单据是否需要校验 boolean secCheckEnable = bussinessTypeService.getSecCheckEnable(orderSaveRequest.getAction(), orderSaveRequest.getCustomerId()); if (secCheckEnable) { diff --git a/src/main/java/com/glxp/udi/admin/util/inout/InoutUtils.java b/src/main/java/com/glxp/udi/admin/util/inout/InoutUtils.java index 778d001..bb046f5 100644 --- a/src/main/java/com/glxp/udi/admin/util/inout/InoutUtils.java +++ b/src/main/java/com/glxp/udi/admin/util/inout/InoutUtils.java @@ -5,7 +5,7 @@ import cn.hutool.core.bean.BeanUtil; import com.glxp.udi.admin.constant.Constant; import com.glxp.udi.admin.constant.TypeConstant; import com.glxp.udi.admin.entity.info.SetupEntity; -import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.entity.inout.OrderDetailEntity; import com.glxp.udi.admin.entity.inout.UdiInfoEntity; import com.glxp.udi.admin.entity.inout.WarehouseEntity; import com.glxp.udi.admin.entity.inout.WarehousetempEntity; @@ -235,23 +235,23 @@ public class InoutUtils { returnOrderDetail.add(entry.getValue()); } - List erpOrderEntities = new ArrayList<>(); + List erpOrderEntities = new ArrayList<>(); for (UdiInfoEntity erpDetailCodeEntity : returnOrderDetail) { - ErpOrderEntity erpOrderEntity = new ErpOrderEntity(); - erpOrderEntity.setNameCode(erpDetailCodeEntity.getNameCode()); - erpOrderEntity.setPackRatio(erpDetailCodeEntity.getPackRatio()); - erpOrderEntity.setCoName(erpDetailCodeEntity.getCpmctymc()); - erpOrderEntity.setLotno(erpDetailCodeEntity.getBatchNo()); - erpOrderEntity.setProduceDate(erpDetailCodeEntity.getProduceDate()); - erpOrderEntity.setExpireDate(erpDetailCodeEntity.getExpireDate()); - erpOrderEntity.setCount(erpDetailCodeEntity.getCount()); - erpOrderEntity.setOrderIdFk(warehouseEntityList.get(0).getOrderId()); - erpOrderEntity.setProductCompany(erpDetailCodeEntity.getYlqxzcrbarmc()); - erpOrderEntity.setAuthCode(erpDetailCodeEntity.getZczbhhzbapzbh()); - erpOrderEntity.setUuidFk(erpOrderEntity.getUuidFk()); - erpOrderEntity.setRelId(String.valueOf(erpDetailCodeEntity.getId())); - erpOrderEntity.setPackSpec(erpDetailCodeEntity.getGgxh()); - erpOrderEntities.add(erpOrderEntity); + OrderDetailEntity orderDetailEntity = new OrderDetailEntity(); + orderDetailEntity.setNameCode(erpDetailCodeEntity.getNameCode()); + orderDetailEntity.setPackRatio(erpDetailCodeEntity.getPackRatio()); + orderDetailEntity.setProductName(erpDetailCodeEntity.getCpmctymc()); + orderDetailEntity.setBatchNo(erpDetailCodeEntity.getBatchNo()); + orderDetailEntity.setProduceDate(erpDetailCodeEntity.getProduceDate()); + orderDetailEntity.setExpireDate(erpDetailCodeEntity.getExpireDate()); + orderDetailEntity.setCount(erpDetailCodeEntity.getCount()); + orderDetailEntity.setOrderIdFk(warehouseEntityList.get(0).getOrderId()); + orderDetailEntity.setProductCompany(erpDetailCodeEntity.getYlqxzcrbarmc()); + orderDetailEntity.setZczbhhzbapzbh(erpDetailCodeEntity.getZczbhhzbapzbh()); + orderDetailEntity.setUuidFk(orderDetailEntity.getUuidFk()); + orderDetailEntity.setRelId(String.valueOf(erpDetailCodeEntity.getId())); + orderDetailEntity.setGgxh(erpDetailCodeEntity.getGgxh()); + erpOrderEntities.add(orderDetailEntity); } if (!erpOrderEntities.isEmpty()) { orderDetailMdService.insertOrderDetail(erpOrderEntities);