From 79e86bb51b4666da87f5c80c12f9e72d9dc5ff96 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 8 Aug 2023 22:03:40 +0800
Subject: [PATCH] =?UTF-8?q?rp:=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DistributionDeliveryListMapper.java | 8 +----
blade-service/logpm-factory/pom.xml | 7 ++++
.../impl/PanFactoryDataServiceImpl.java | 33 ++++++++-----------
3 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
index 90b3b2549..3eb2125f8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
@@ -28,14 +28,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO;
import com.logpm.distribution.vo.app.DistributionAppParcelListVO;
import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
-import com.logpm.distribution.vo.app.DistributionAppStockListVO;
import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.javassist.bytecode.analysis.Executor;
-import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.plugin.Intercepts;
-import org.apache.ibatis.plugin.Signature;
-import org.apache.ibatis.session.RowBounds;
-import sun.plugin2.main.server.ResultHandler;
+
import java.util.List;
diff --git a/blade-service/logpm-factory/pom.xml b/blade-service/logpm-factory/pom.xml
index a541cd888..d30e63609 100644
--- a/blade-service/logpm-factory/pom.xml
+++ b/blade-service/logpm-factory/pom.xml
@@ -51,6 +51,13 @@
+
+ org.springblade
+ logpm-basic-api
+ ${bladex.project.version}
+
+
+
com.baomidou
dynamic-datasource-spring-boot-starter
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
index 0bcd11366..9eeee9a88 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
@@ -6,6 +6,9 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.shaded.com.google.gson.Gson;
import com.alibaba.nacos.shaded.com.google.gson.GsonBuilder;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.logpm.basic.entity.BasicMaterialEntity;
+import com.logpm.basic.feign.IBasicMaterialClient;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -90,6 +93,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
private final IWarehouseWaybillClient warehouseWaybillClient;
+ private final IBasicMaterialClient basicMaterialClient;
+
// @Override
// public FactoryTokenVO getToken(String corpId, String appKey, String appSecret) throws NoSuchAlgorithmException {
//
@@ -372,7 +377,6 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
// 其实是客户
distributionStockArticleEntity.setMallName(takeCompany);
-
distributionStockArticleEntity.setWarehouse(destinationWarehouse);
distributionStockArticleEntity.setWarehouseId(basicdataWarehouseEntity.getId());
@@ -443,7 +447,6 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue());
-
id = distributionStockArticleClient.addData(distributionStockArticleEntity);
if (id == 0) {
logger.warn("#################handleDataToPlatform: 保存订单信息失败 orderSelfNum={}", orderSelfNum);
@@ -457,13 +460,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
saveOrderPackage(unitNo, distributionStockArticleEntity, id, basicdataWarehouseEntity);
//包件保存成功去修改订单的数量
distributionStockArticleClient.addHandQuantity(id,1);
-
-
- // 根据包件维护订单的状态
-
-
-
-
+ // todo 这里需要根据包件状态修改状态
logger.info("#################handleDataToPlatform: 数据处理完成");
}else {
//已存在包件信息那就不处理
@@ -499,6 +496,14 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
}
entity.setCreateUser(1123598821738675201L);
entity.setTenantId(TenantNum.HUITONGCODE);
+ if(StringUtil.isNoneBlank(entity.getMaterialName())){
+ // 查询物料信息
+ BasicMaterialEntity basicMaterialEntity =basicMaterialClient.getMaterialOwn(null,entity.getMaterialName(),null);
+ if(ObjectUtils.isNotNull(basicMaterialEntity)){
+ entity.setMaterialId(basicdataWarehouseEntity.getId());
+ entity.setMaterialCode(basicMaterialEntity.getProductCode());
+ }
+ }
boolean b = distributionParcelListClient.add(entity);
if (!b) {
logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderCode={}", entity.getOrderCode());
@@ -631,18 +636,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
}
-// private void dealwithWaybillData(MainlineWaybill mainlineWaybill,String waybillNo) {
-// 查询老系统运单数据
-// WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo);
-// if(!Objects.isNull(wayBillEntity)){
-// mainlineWaybill.setWaybillNumber(waybillNo);
-// mainlineWaybill.setO
-// }
-
-// }
-
@Transactional
@Override
public Long saveData(PanFactoryOrderDTO factoryOrderDTO) {