退货管理和收货管理查询和详情中的字段完善

82376b12 · zhangqiliang · 348fff43 · 82376b12 · 82376b12 · 82376b12
--- a/src/main/java/com/starcharge/wios/controller/DeliveryController.java
+++ b/src/main/java/com/starcharge/wios/controller/DeliveryController.java
@@ -107,10 +107,10 @@ public class DeliveryController {
                        //如果是墙盒 根据订单号去订单表里把墙盒名称 墙盒类别 厂商拿到并添加到发货表里
                        Order selectOrder = orderDao.selectById(da.getInstallOrder());
                        if (!StringUtils.isEmpty(selectOrder)){
-                            //物料名称
+                           /* //物料名称
                            if (!StringUtils.isEmpty(selectOrder.getInstallWallboxModel())){
                                delivery.setMaterialName(selectOrder.getInstallWallboxModel());
-                            }
+                            }*/
                            //物料类型
                            delivery.setMaterialCategory(da.getIsproduct());
                            //厂商

--- a/src/main/java/com/starcharge/wios/dao/entity/Delivery.java
+++ b/src/main/java/com/starcharge/wios/dao/entity/Delivery.java
@@ -384,6 +384,20 @@ public class Delivery extends PageVo implements Serializable {
     */
    @ApiModelProperty(value = "创建人名称")
    private String createName;
+    /**
+     * 退货数量
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "退货数量")
+    private Integer rejectQuantity;
+    /**
+     * 所属区域
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "所属区域")
+    private String regionName;
    private static final long serialVersionUID = 1L;

--- a/src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml
+++ b/src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml
@@ -30,7 +30,6 @@
    <result column="check_user" jdbcType="VARCHAR" property="checkUser" />
    <result column="check_user_name" jdbcType="VARCHAR" property="checkUserName" />
    <result column="check_suggestion" jdbcType="VARCHAR" property="checkSuggestion" />
-    <result column="out_order_id" jdbcType="VARCHAR" property="outOrderId" />
    <result column="reject_logistic_order" jdbcType="VARCHAR" property="rejectLogisticOrder" />
    <result column="arrival_quantity" jdbcType="VARCHAR" property="arrivalQuantity" />
    <result column="auxiliary_id" jdbcType="VARCHAR" property="auxiliaryId" />
@@ -105,10 +104,10 @@
  </sql>
  <sql id="Base_Column_List">
    id, delivery_order, install_order, product_batch, quantity, material_category, material_code, 
-    material_name, material_company, logistic_order, logistic_company, logistic_status, 
+    material_name, material_company, logistic_order, '德邦物流' as logistic_company, logistic_status,
    team, isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, arrival_warehouse, 
    arrival_warehouse_id, receiver,remarks,reject_material,reason,check_time,check_user,check_user_name,check_suggestion,reject_logistic_order,
-        arrival_quantity,auxiliary_id,file_url,material_sn,receiver_phone,sender,sender_phone,receive_address,receive_time,reject_time
+        arrival_quantity,auxiliary_id,file_url,material_sn,receiver_phone,sender,sender_phone,receive_address,receive_time,reject_time,1 as rejectQuantity
  </sql>
  <select id="selectDeliveryList" parameterType="com.starcharge.wios.dao.entity.Delivery" resultMap="BaseResultMap">
@@ -175,18 +174,19 @@
  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
    select
      t.id, t.delivery_order, t.install_order, t.product_batch, t.quantity, t.material_category, t.material_code,
-      t.material_name, t.material_company, t.logistic_order, t.logistic_company, t.logistic_status,
+      t.material_name, t.material_company, t.logistic_order, '德邦物流' as logistic_company, t.logistic_status,
      t.team, t.isproduct, t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.arrival_warehouse,
      t.arrival_warehouse_id, t.receiver, t.remarks, t.reject_material, t.reason, t.check_time, t.check_user, t.check_user_name, t.check_suggestion,
      t.reject_logistic_order,t.arrival_quantity,t.auxiliary_id,t.file_url,t.material_sn,t.warehouse_id,t.receiver_phone,
-      t.sender,t.sender_phone,t.receive_time,t.reject_time,e.out_order_id outOrderId,
+      t.sender,t.sender_phone,t.receive_time,t.reject_time,e.out_order_id outOrderId,e.install_reserve_time installReserveTime,
-      tw.create_account createAccount,tw.install_reserve_time installReserveTime,tw.if_emergency ifEmergency,tc.name wallboxModelName,
+      tw.create_account createAccount,tw.if_emergency ifEmergency,tc.name wallboxModelName,reg.name as regionName,
      wa.name createName
    from t_delivery t
    left join t_order e  on e.id = t.install_order
    left join t_wallbox_apply tw on tw.order_id = t.install_order
    left join t_oem_cascade tc on tc.id = tw.wallbox_model
    left join wb_account wa on wa.id = t.CREATED_BY
+    left join t_region reg on reg.id = tw.region_id
    where t.id = #{id,jdbcType=INTEGER}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">