发货表信息中添加到货仓库信息

src/main/java/com/starcharge/wios/controller/DeliveryController.java

@@ -136,6 +136,8 @@ public class DeliveryController {
                     JSONObject jsonObjectData=JSONObject.parseObject(data);
                     JSONObject jsonObjectData=JSONObject.parseObject(data);
                     delivery.setSender(jsonObjectData.getString("receivePeople"));
                     delivery.setSender(jsonObjectData.getString("receivePeople"));
                     delivery.setSenderPhone(jsonObjectData.getString("receivePhone"));
                     delivery.setSenderPhone(jsonObjectData.getString("receivePhone"));
+                    delivery.setWarehouseId(da.getWarehouseId());
+                    delivery.setWarehouseName(jsonObjectData.getString("name"));
                     //收货仓库的信息
                     //收货仓库的信息
                      if (!ProductType.辅材.name().equals(da.getIsproduct())){
                      if (!ProductType.辅材.name().equals(da.getIsproduct())){
                          Map<String, String> paramArrival = new HashMap<String, String>();
                          Map<String, String> paramArrival = new HashMap<String, String>();
@@ -146,12 +148,15 @@ public class DeliveryController {
                          JSONObject jsonObjectDataArrival=JSONObject.parseObject(dataArrival);
                          JSONObject jsonObjectDataArrival=JSONObject.parseObject(dataArrival);
                          delivery.setReceiver(jsonObjectDataArrival.getString("receivePeople"));
                          delivery.setReceiver(jsonObjectDataArrival.getString("receivePeople"));
                          delivery.setReceiverPhone(jsonObjectDataArrival.getString("receivePhone"));
                          delivery.setReceiverPhone(jsonObjectDataArrival.getString("receivePhone"));
+                         delivery.setArrivalWarehouseId(da.getArrivalWarehouseId());
+                         delivery.setArrivalWarehouse(jsonObjectDataArrival.getString("name"));
                     }else {
                     }else {
                         Tauxiliarymaterials tauxiliarymaterials = tauxiliarymaterialsMapper.selectByApplyOrder(da.getInstallOrder());
                         Tauxiliarymaterials tauxiliarymaterials = tauxiliarymaterialsMapper.selectByApplyOrder(da.getInstallOrder());
                         if (!StringUtils.isEmpty(tauxiliarymaterials)){
                         if (!StringUtils.isEmpty(tauxiliarymaterials)){
                             delivery.setReceiver(tauxiliarymaterials.getRecipents());
                             delivery.setReceiver(tauxiliarymaterials.getRecipents());
                             delivery.setReceiverPhone(tauxiliarymaterials.getReceivePhone());
                             delivery.setReceiverPhone(tauxiliarymaterials.getReceivePhone());
                             delivery.setReceiveAddress(tauxiliarymaterials.getReceiveAddress());
                             delivery.setReceiveAddress(tauxiliarymaterials.getReceiveAddress());
+                            delivery.setArrivalWarehouseId(da.getArrivalWarehouseId());
                         }
                         }
                      }
                      }
                     this.commonUpdateService.UpdateColumns(delivery,true);
                     this.commonUpdateService.UpdateColumns(delivery,true);

src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java

@@ -78,6 +78,7 @@ public class TauxiliarymaterialsController {
         tauxiliarymaterials.setCreatedTime(now);
         tauxiliarymaterials.setCreatedTime(now);
         tauxiliarymaterials.setUpdatedBy(sessionInfo.getUserId());
         tauxiliarymaterials.setUpdatedBy(sessionInfo.getUserId());
         tauxiliarymaterials.setUpdatedTime(now);
         tauxiliarymaterials.setUpdatedTime(now);
+        tauxiliarymaterials.setWarehouseName(tauxiliarymaterialsVo.getWarehouseName());
         //暂时代替申请单号
         //暂时代替申请单号
         tauxiliarymaterials.setApplyOrder("FC"+NumberUtil.getRandomOrderId());
         tauxiliarymaterials.setApplyOrder("FC"+NumberUtil.getRandomOrderId());
         tauxiliarymaterialsMapper.insertSelective(tauxiliarymaterials);
         tauxiliarymaterialsMapper.insertSelective(tauxiliarymaterials);

src/main/java/com/starcharge/wios/dao/entity/Tauxiliarymaterials.java

@@ -335,6 +335,13 @@ public class Tauxiliarymaterials  extends PageVo implements Serializable{
      */
      */
     @ApiModelProperty(value = "所属区域")
     @ApiModelProperty(value = "所属区域")
     private String areaName;
     private String areaName;
+    /**
+     * 仓库名称
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "仓库名称")
+    private String warehouseName;
 
 
 
 
 }
 }
\ No newline at end of file

src/main/java/com/starcharge/wios/dao/mappers/TauxiliarymaterialsMapper.xml

@@ -257,6 +257,9 @@
       <if test="areaName != null">
       <if test="areaName != null">
         area_name,
         area_name,
       </if>
       </if>
+      <if test="warehouseName != null">
+        warehouse_name,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="materialCode != null">
       <if test="materialCode != null">
@@ -352,6 +355,9 @@
       <if test="areaName != null">
       <if test="areaName != null">
         #{areaName,jdbcType=VARCHAR},
         #{areaName,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="warehouseName != null">
+        #{warehouseName,jdbcType=VARCHAR},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria" resultType="java.lang.Long">
   <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria" resultType="java.lang.Long">

src/main/java/com/starcharge/wios/vo/TauxiliarymaterialsVo.java

@@ -163,4 +163,11 @@ public class TauxiliarymaterialsVo {
      */
      */
     @ApiModelProperty(value = "所属区域")
     @ApiModelProperty(value = "所属区域")
     private String areaName;
     private String areaName;
+    /**
+     * 仓库名称
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "仓库名称")
+    private String warehouseName;
 }
 }