Merge branch 'master' of code.sz-chaohui.cn:miaoweiw/wios

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

@@ -101,13 +101,13 @@ public class OrderInstallController {
         return new BaseResponse<OrderInstallVo>(orderInstall);
         return new BaseResponse<OrderInstallVo>(orderInstall);
     }
     }
     /**
     /**
-     * 填写安装报告
+     * 校验墙盒SN号
      *
      *
      * @param materialSn
      * @param materialSn
      * @return
      * @return
      */
      */
     @PostMapping(value = "orderInstall/instaallReport")
     @PostMapping(value = "orderInstall/instaallReport")
-    @ApiOperation(value = "填写安装报告")
+    @ApiOperation(value = "校验墙盒SN号")
     public BaseResponse<Object> instaallReport(String materialSn) {
     public BaseResponse<Object> instaallReport(String materialSn) {
         Delivery delivery=this.deliveryMapper.selectByMaterialSn(materialSn);
         Delivery delivery=this.deliveryMapper.selectByMaterialSn(materialSn);
         if (StringUtils.isEmpty(delivery)){
         if (StringUtils.isEmpty(delivery)){

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

@@ -154,7 +154,7 @@ public class RejectController {
         if (StringUtil.isNullOrEmpty(codeReduce)){
         if (StringUtil.isNullOrEmpty(codeReduce)){
             throw new ServiceException("到货仓库库存扣减失败");
             throw new ServiceException("到货仓库库存扣减失败");
         }
         }
-        deliveryUpdateDTO.setLogisticStatus("退货已申请");
+        deliveryUpdateDTO.setLogisticStatus("退货完成");
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
     }
     }

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

@@ -293,4 +293,12 @@ public class Tauxiliarymaterials  extends PageVo implements Serializable{
      */
      */
     @ApiModelProperty(value = "物流id和服务商")
     @ApiModelProperty(value = "物流id和服务商")
     private List<String> logisticIdAndCompany;
     private List<String> logisticIdAndCompany;
+    /**
+     * 服务商ID
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "服务商ID")
+    private Integer supplierId;
+
 }
 }
\ No newline at end of file

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

@@ -553,8 +553,8 @@
       <if test="fileUrl != null">
       <if test="fileUrl != null">
         file_url = #{fileUrl,jdbcType=VARCHAR},
         file_url = #{fileUrl,jdbcType=VARCHAR},
       </if>
       </if>
-      <if test="materialSn != null">
-        material_sn = #{materialSn,jdbcType=VARCHAR},
+      <if test="installStatus != null">
+        install_status = #{installStatus,jdbcType=INTEGER},
       </if>
       </if>
     </set>
     </set>
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}

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

@@ -626,37 +626,43 @@
   </sql>
   </sql>
 
 
   <select id="selectTAuxiliaryMaterialsList" parameterType="com.starcharge.wios.dao.entity.Tauxiliarymaterials" resultMap="BaseResultMap">
   <select id="selectTAuxiliaryMaterialsList" parameterType="com.starcharge.wios.dao.entity.Tauxiliarymaterials" resultMap="BaseResultMap">
-    <include refid="selectTAuxiliaryMaterialsVo"/>
+    select t.id, t.material_code, t.material_name, t.measurement_unit, t.apply_quantity, t.approved_quantity, t.currenty_sap,
+    t.month_amount_sap, t.year_amount, t.apply_status, t.team, t.logistic_status, t.receiving_status, t.recipents,
+    t.receive_address, t.receive_phone, t.apply_time, t.check_user, t.check_user_name, t.check_time, t.check_suggestion,
+    t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.install_order, t.specification, t.logistic_order,
+    t.apply_inventory, t.apply_order,ts.id supplierId
+    from t_auxiliary_materials t
+    left join t_supplier ts on ts.name = t.team
     <where>
     <where>
-      <if test="materialCode != null  and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
-      <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
-      <if test="measurementUnit != null  and measurementUnit != ''"> and measurement_unit = #{measurementUnit}</if>
-      <if test="applyQuantity != null  and applyQuantity != ''"> and apply_quantity = #{applyQuantity}</if>
-      <if test="approvedQuantity != null  and approvedQuantity != ''"> and approved_quantity = #{approvedQuantity}</if>
-      <if test="currentySap != null  and currentySap != ''"> and currenty_sap = #{currentySap}</if>
-      <if test="monthAmountSap != null  and monthAmountSap != ''"> and month_amount_sap = #{monthAmountSap}</if>
-      <if test="yearAmount != null  and yearAmount != ''"> and year_amount = #{yearAmount}</if>
-      <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
-      <if test="team != null  and team != ''"> and team like concat('%', #{team}, '%')</if>
-      <if test="logisticStatus != null  and logisticStatus != ''"> and logistic_status = #{logisticStatus}</if>
-      <if test="receivingStatus != null  and receivingStatus != ''"> and receiving_status = #{receivingStatus}</if>
-      <if test="recipents != null  and recipents != ''"> and recipents = #{recipents}</if>
-      <if test="receiveAddress != null  and receiveAddress != ''"> and receive_address = #{receiveAddress}</if>
-      <if test="receivePhone != null  and receivePhone != ''"> and receive_phone = #{receivePhone}</if>
-      <if test="applyTime != null "> and apply_time = #{applyTime}</if>
-      <if test="checkUser != null  and checkUser != ''"> and check_user = #{checkUser}</if>
-      <if test="checkUserName != null  and checkUserName != ''"> and check_user_name like concat('%', #{checkUserName}, '%')</if>
-      <if test="checkTime != null "> and check_time = #{checkTime}</if>
-      <if test="checkSuggestion != null  and checkSuggestion != ''"> and check_suggestion = #{checkSuggestion}</if>
-      <if test="createdBy != null  and createdBy != ''"> and CREATED_BY = #{createdBy}</if>
-      <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
-      <if test="updatedBy != null  and updatedBy != ''"> and UPDATED_BY = #{updatedBy}</if>
-      <if test="updatedTime != null "> and UPDATED_TIME = #{updatedTime}</if>
-      <if test="installOrder != null  and installOrder != ''"> and install_order like concat('%', #{installOrder}, '%')</if>
-      <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
-      <if test="logisticOrder != null  and logisticOrder != ''"> and logistic_order = #{logisticOrder}</if>
-      <if test="applyInventory != null  and applyInventory != ''"> and apply_inventory = #{applyInventory}</if>
-      <if test="applyOrder != null  and applyOrder != ''"> and apply_order like concat('%', #{applyOrder}, '%')</if>
+      <if test="materialCode != null  and materialCode != ''"> and t.material_code like concat('%', #{materialCode}, '%')</if>
+      <if test="materialName != null  and materialName != ''"> and t.material_name like concat('%', #{materialName}, '%')</if>
+      <if test="measurementUnit != null  and measurementUnit != ''"> and t.measurement_unit = #{measurementUnit}</if>
+      <if test="applyQuantity != null  and applyQuantity != ''"> and t.apply_quantity = #{applyQuantity}</if>
+      <if test="approvedQuantity != null  and approvedQuantity != ''"> and t.approved_quantity = #{approvedQuantity}</if>
+      <if test="currentySap != null  and currentySap != ''"> and t.currenty_sap = #{currentySap}</if>
+      <if test="monthAmountSap != null  and monthAmountSap != ''"> and t.month_amount_sap = #{monthAmountSap}</if>
+      <if test="yearAmount != null  and yearAmount != ''"> and t.year_amount = #{yearAmount}</if>
+      <if test="applyStatus != null  and applyStatus != ''"> and t.apply_status = #{applyStatus}</if>
+      <if test="team != null  and team != ''"> and t.team like concat('%', #{team}, '%')</if>
+      <if test="logisticStatus != null  and logisticStatus != ''"> and t.logistic_status = #{logisticStatus}</if>
+      <if test="receivingStatus != null  and receivingStatus != ''"> and t.receiving_status = #{receivingStatus}</if>
+      <if test="recipents != null  and recipents != ''"> and t.recipents = #{recipents}</if>
+      <if test="receiveAddress != null  and receiveAddress != ''"> and t.receive_address = #{receiveAddress}</if>
+      <if test="receivePhone != null  and receivePhone != ''"> and t.receive_phone = #{receivePhone}</if>
+      <if test="applyTime != null "> and t.apply_time = #{applyTime}</if>
+      <if test="checkUser != null  and checkUser != ''"> and t.check_user = #{checkUser}</if>
+      <if test="checkUserName != null  and checkUserName != ''"> and t.check_user_name like concat('%', #{checkUserName}, '%')</if>
+      <if test="checkTime != null "> and t.check_time = #{checkTime}</if>
+      <if test="checkSuggestion != null  and checkSuggestion != ''"> and t.check_suggestion = #{checkSuggestion}</if>
+      <if test="createdBy != null  and createdBy != ''"> and t.CREATED_BY = #{createdBy}</if>
+      <if test="createdTime != null "> and t.CREATED_TIME = #{createdTime}</if>
+      <if test="updatedBy != null  and updatedBy != ''"> and t.UPDATED_BY = #{updatedBy}</if>
+      <if test="updatedTime != null "> and t.UPDATED_TIME = #{updatedTime}</if>
+      <if test="installOrder != null  and installOrder != ''"> and t.install_order like concat('%', #{installOrder}, '%')</if>
+      <if test="specification != null  and specification != ''"> and t.specification = #{specification}</if>
+      <if test="logisticOrder != null  and logisticOrder != ''"> and t.logistic_order = #{logisticOrder}</if>
+      <if test="applyInventory != null  and applyInventory != ''"> and t.apply_inventory = #{applyInventory}</if>
+      <if test="applyOrder != null  and applyOrder != ''"> and t.apply_order like concat('%', #{applyOrder}, '%')</if>
     </where>
     </where>
   </select>
   </select>