From c84d7144400292bd75bc3494003b7cee21a590f2 Mon Sep 17 00:00:00 2001
From: zhangqiliang <3435881587@qq.com>
Date: Tue, 28 Nov 2023 21:46:20 +0800
Subject: [PATCH] 发货表信息中添加到货仓库信息
---
src/main/java/com/starcharge/wios/controller/DeliveryController.java | 5 +++++
src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java | 1 +
src/main/java/com/starcharge/wios/dao/entity/Tauxiliarymaterials.java | 7 +++++++
src/main/java/com/starcharge/wios/dao/mappers/TauxiliarymaterialsMapper.xml | 6 ++++++
src/main/java/com/starcharge/wios/vo/TauxiliarymaterialsVo.java | 7 +++++++
5 files changed, 26 insertions(+)
diff --git a/src/main/java/com/starcharge/wios/controller/DeliveryController.java b/src/main/java/com/starcharge/wios/controller/DeliveryController.java
index b84dab6..aaf4fcc 100644
--- a/src/main/java/com/starcharge/wios/controller/DeliveryController.java
+++ b/src/main/java/com/starcharge/wios/controller/DeliveryController.java
@@ -136,6 +136,8 @@ public class DeliveryController {
JSONObject jsonObjectData=JSONObject.parseObject(data);
delivery.setSender(jsonObjectData.getString("receivePeople"));
delivery.setSenderPhone(jsonObjectData.getString("receivePhone"));
+ delivery.setWarehouseId(da.getWarehouseId());
+ delivery.setWarehouseName(jsonObjectData.getString("name"));
//收货仓库的信息
if (!ProductType.辅材.name().equals(da.getIsproduct())){
Map<String, String> paramArrival = new HashMap<String, String>();
@@ -146,12 +148,15 @@ public class DeliveryController {
JSONObject jsonObjectDataArrival=JSONObject.parseObject(dataArrival);
delivery.setReceiver(jsonObjectDataArrival.getString("receivePeople"));
delivery.setReceiverPhone(jsonObjectDataArrival.getString("receivePhone"));
+ delivery.setArrivalWarehouseId(da.getArrivalWarehouseId());
+ delivery.setArrivalWarehouse(jsonObjectDataArrival.getString("name"));
}else {
Tauxiliarymaterials tauxiliarymaterials = tauxiliarymaterialsMapper.selectByApplyOrder(da.getInstallOrder());
if (!StringUtils.isEmpty(tauxiliarymaterials)){
delivery.setReceiver(tauxiliarymaterials.getRecipents());
delivery.setReceiverPhone(tauxiliarymaterials.getReceivePhone());
delivery.setReceiveAddress(tauxiliarymaterials.getReceiveAddress());
+ delivery.setArrivalWarehouseId(da.getArrivalWarehouseId());
}
}
this.commonUpdateService.UpdateColumns(delivery,true);
diff --git a/src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java b/src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java
index 1ea0214..25ae6b0 100644
--- a/src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java
+++ b/src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java
@@ -78,6 +78,7 @@ public class TauxiliarymaterialsController {
tauxiliarymaterials.setCreatedTime(now);
tauxiliarymaterials.setUpdatedBy(sessionInfo.getUserId());
tauxiliarymaterials.setUpdatedTime(now);
+ tauxiliarymaterials.setWarehouseName(tauxiliarymaterialsVo.getWarehouseName());
//暂时代替申请单号
tauxiliarymaterials.setApplyOrder("FC"+NumberUtil.getRandomOrderId());
tauxiliarymaterialsMapper.insertSelective(tauxiliarymaterials);
diff --git a/src/main/java/com/starcharge/wios/dao/entity/Tauxiliarymaterials.java b/src/main/java/com/starcharge/wios/dao/entity/Tauxiliarymaterials.java
index 1fa40f4..b081cca 100644
--- a/src/main/java/com/starcharge/wios/dao/entity/Tauxiliarymaterials.java
+++ b/src/main/java/com/starcharge/wios/dao/entity/Tauxiliarymaterials.java
@@ -335,6 +335,13 @@ public class Tauxiliarymaterials extends PageVo implements Serializable{
*/
@ApiModelProperty(value = "所属区域")
private String areaName;
+ /**
+ * 仓库名称
+ *
+ * @mbg.generated
+ */
+ @ApiModelProperty(value = "仓库名称")
+ private String warehouseName;
}
\ No newline at end of file
diff --git a/src/main/java/com/starcharge/wios/dao/mappers/TauxiliarymaterialsMapper.xml b/src/main/java/com/starcharge/wios/dao/mappers/TauxiliarymaterialsMapper.xml
index e2adeab..cb77d36 100644
--- a/src/main/java/com/starcharge/wios/dao/mappers/TauxiliarymaterialsMapper.xml
+++ b/src/main/java/com/starcharge/wios/dao/mappers/TauxiliarymaterialsMapper.xml
@@ -257,6 +257,9 @@
<if test="areaName != null">
area_name,
</if>
+ <if test="warehouseName != null">
+ warehouse_name,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="materialCode != null">
@@ -352,6 +355,9 @@
<if test="areaName != null">
#{areaName,jdbcType=VARCHAR},
</if>
+ <if test="warehouseName != null">
+ #{warehouseName,jdbcType=VARCHAR},
+ </if>
</trim>
</insert>
<select id="countByExample" parameterType="com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria" resultType="java.lang.Long">
diff --git a/src/main/java/com/starcharge/wios/vo/TauxiliarymaterialsVo.java b/src/main/java/com/starcharge/wios/vo/TauxiliarymaterialsVo.java
index fcae0bb..02c47ee 100644
--- a/src/main/java/com/starcharge/wios/vo/TauxiliarymaterialsVo.java
+++ b/src/main/java/com/starcharge/wios/vo/TauxiliarymaterialsVo.java
@@ -163,4 +163,11 @@ public class TauxiliarymaterialsVo {
*/
@ApiModelProperty(value = "所属区域")
private String areaName;
+ /**
+ * 仓库名称
+ *
+ * @mbg.generated
+ */
+ @ApiModelProperty(value = "仓库名称")
+ private String warehouseName;
}
--
libgit2 0.26.0