From 71d1cf46d72d284b98b204ec301127fb3aba40c5 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 5 Aug 2022 15:13:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=97=B6=E5=90=8C=E6=97=B6=E5=90=8C=E6=AD=A5=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/business/StockOrderRemakDao.java | 17 ++++++++ .../business/StockOrderRemakEntity.java | 21 ++++++++++ .../api/admin/httpclient/SpGetHttpClient.java | 2 +- .../admin/res/basic/SpsSyncOrderResponse.java | 5 +++ .../glxp/api/admin/thread/DlBasicService.java | 18 ++++++++- .../api/admin/thread/IoTransInoutService.java | 32 ++++++++++----- .../com/glxp/api/admin/util/OkHttpCli.java | 2 +- .../mapper/business/StockOrderRemakDao.xml | 39 +++++++++++++++++++ 8 files changed, 123 insertions(+), 13 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java new file mode 100644 index 00000000..5b8ad38f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.dao.business; + +import com.glxp.api.admin.entity.business.StockOrderRemakEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface StockOrderRemakDao { + + List findByOrderIdFk(@Param("id") String id); + + boolean insertOrderRemaks(@Param("orderRemakEntities") List OrderRemakEntitys); + + boolean deleteByOrderIdFk(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java new file mode 100644 index 00000000..7d92f3d3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.entity.business; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class StockOrderRemakEntity { + private Integer id; + private String orderIdFk; + private String relId; + private String batchNo; + private BigDecimal price; + private String secSalesListNo; + private String firstSalesInvNo; + private String secSalesInvNo; + private String invoiceDate; + private String remark; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java index 1881083a..ff42b243 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java @@ -92,6 +92,7 @@ public class SpGetHttpClient { public BaseResponse> getBasicStatus(String type) { Map paramMap = new HashMap<>(16); paramMap.put("type", type); + paramMap.put("status", "3"); String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap); try { BaseResponse> data = @@ -149,7 +150,6 @@ public class SpGetHttpClient { basicExportStatusRequest.setType(type); String json = JSONUtil.toJsonStr(basicExportStatusRequest); String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", json); -// String result = UHttpClient.postJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", basicExportStatusRequest); return result; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java index 0265da7e..64fba687 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.res.basic; +import com.glxp.api.admin.entity.business.StockOrderRemakEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; @@ -15,4 +16,8 @@ public class SpsSyncOrderResponse { List orderEntities; List orderDetailEntityList; List warehouseEntityList; + + + List stockOrderRemakEntities; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index e562ea87..aae25435 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -7,6 +7,7 @@ import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.dao.auth.AuthAdminDao; import com.glxp.api.admin.dao.basic.*; +import com.glxp.api.admin.dao.business.StockOrderRemakDao; import com.glxp.api.admin.dao.inout.CodesTempDao; import com.glxp.api.admin.dao.inout.OrderDao; import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao; @@ -17,6 +18,7 @@ import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao; import com.glxp.api.admin.dao.thrsys.ThrProductsDao; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.basic.*; +import com.glxp.api.admin.entity.business.StockOrderRemakEntity; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; @@ -94,7 +96,9 @@ public class DlBasicService { @Resource private BussinessTypeService bussinessTypeService; @Resource - private SystemParamConfigService systemParamConfigService; + private StockOrderRemakDao stockOrderRemakDao; + + private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class); //------------------------------------------------------------ @@ -213,6 +217,7 @@ public class DlBasicService { batchSession.commit(); remark.append("往来单位：").append(syncDataResponse.getBasicUnitMaintainEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -227,6 +232,7 @@ public class DlBasicService { } batchSession.commit(); } catch (Exception e) { + e.printStackTrace(); } } @@ -244,6 +250,7 @@ public class DlBasicService { batchSession.commit(); remark.append("第三方产品信息：").append(syncDataResponse.getThrProductsEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -260,6 +267,7 @@ public class DlBasicService { batchSession.commit(); remark.append("第三方往来单位信息：").append(syncDataResponse.getThrCorpEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -275,6 +283,7 @@ public class DlBasicService { batchSession.commit(); remark.append("第三方业务单据：").append(syncDataResponse.getThrOrderEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -289,6 +298,7 @@ public class DlBasicService { batchSession.commit(); remark.append("第三方业务单据详情：").append(syncDataResponse.getThrOrderDetailEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -508,7 +518,10 @@ public class DlBasicService { } batchSession.commit(); - + if (CollUtil.isNotEmpty(syncDataResponse.getStockOrderRemakEntities())) { + List stockOrderRemakEntities = syncDataResponse.getStockOrderRemakEntities(); + stockOrderRemakDao.insertOrderRemaks(stockOrderRemakEntities); + } String logs = ""; if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) logs = logs + "单据：" + syncDataResponse.getOrderEntities().size() + "条\n"; @@ -518,6 +531,7 @@ public class DlBasicService { logs = logs + "单据条码信息：" + syncDataResponse.getWarehouseEntityList().size() + "条\n"; remark.append(logs); } catch (Exception e) { + e.printStackTrace(); } } batchSession.close(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index 5fef8b2e..867881dd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -10,9 +10,11 @@ import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils; import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.api.admin.controller.inout.utils.DataTransUtil; import com.glxp.api.admin.controller.inout.utils.InoutUtils; +import com.glxp.api.admin.dao.business.StockOrderRemakDao; import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; +import com.glxp.api.admin.entity.business.StockOrderRemakEntity; import com.glxp.api.admin.entity.info.CompanyEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; @@ -77,14 +79,10 @@ public class IoTransInoutService { @Resource private OrderDetailService myErpOrderService; - @Resource - BussinessLocalTypeService bussinessLocalTypeService; @Resource UdiRelevanceService udiRelevanceService; @Resource private UdiInfoService udiInfoService; - @Value("${UDI_SERVER_URL}") - private String udiUrl; @Resource private CodesTempService codesTempService; @@ -101,17 +99,15 @@ public class IoTransInoutService { @Resource CompanyProductRelevanceService companyProductRelevanceService; @Resource - CompanyService companyService; - @Resource InvWarehouseService invWarehouseService; @Resource InvProductService invProductService; @Resource InvPreProductService invPreProductService; @Resource - UdiDlHttpClient udiDlHttpClient; - @Resource GennerOrderUtils gennerOrderUtils; + @Resource + StockOrderRemakDao stockOrderRemakDao; @Async public void creatOrderAsycn(PostOrderRequest postOrderRequest, Integer fromType) { @@ -823,7 +819,6 @@ public class IoTransInoutService { stockOrderDetailEntity.setBatchNo(erpOrderEntity.getBatchNo()); stockOrderDetailEntity.setProductDate(erpOrderEntity.getProductDate()); stockOrderDetailEntity.setExpireDate(erpOrderEntity.getExpireDate()); -// stockOrderDetailEntity.setYlqxzcrbarmc(erpOrderEntity.get()); if (erpOrderEntity.getCount() != null) { stockOrderDetailEntity.setSweepCount(erpOrderEntity.getCount()); stockOrderDetailEntity.setReCount(erpOrderEntity.getCount()); @@ -838,6 +833,25 @@ public class IoTransInoutService { stockOrderDetailEntity.setCount(erpOrderEntity.getErpCount()); } + if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) { + + List stockOrderRemakEntities = stockOrderRemakDao.findByOrderIdFk(orderId); + + for (StockOrderRemakEntity stockOrderRemakEntity : stockOrderRemakEntities) { + if (StrUtil.trimToEmpty(stockOrderRemakEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) + && + StrUtil.trimToEmpty(stockOrderRemakEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())) + ) { + stockOrderDetailEntity.setPrice(stockOrderRemakEntity.getPrice()); + stockOrderDetailEntity.setSecSalesInvNo(stockOrderRemakEntity.getSecSalesInvNo()); + stockOrderDetailEntity.setFirstSalesInvNo(stockOrderRemakEntity.getFirstSalesInvNo()); + stockOrderDetailEntity.setSecSalesInvNo(stockOrderRemakEntity.getSecSalesInvNo()); + stockOrderDetailEntity.setInvoiceDate(stockOrderRemakEntity.getInvoiceDate()); + } + } + } + + stockOrderDetailEntities.add(stockOrderDetailEntity); } if (!isError) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java b/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java index 3c01f576..f1aace9d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java @@ -97,7 +97,7 @@ public class OkHttpCli { } } - + log.info(sb.toString()); Request request = builder.url(sb.toString()).build(); log.info("do get request and url[{}]", sb.toString()); return execute(request); diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml new file mode 100644 index 00000000..faee96f1 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml @@ -0,0 +1,39 @@ + + + + + + + + + + insert INTO stock_order_remak( + orderIdFk,batchNo,price,relId + ,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,remark) + values + + ( + #{item.orderIdFk}, + #{item.batchNo}, + #{item.price},#{item.relId},#{item.firstSalesInvNo},#{item.secSalesInvNo}, + #{item.secSalesListNo},#{item.invoiceDate},#{item.remark} + ) + + + + + + DELETE + FROM stock_order_remak + WHERE orderIdFk = #{id} + + + + \ No newline at end of file