Merge remote-tracking branch 'origin/master'

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

@@ -14,6 +14,7 @@ import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
 import com.starcharge.wios.dto.TauxiliarymaterialsCheckDto;
 import com.starcharge.wios.dto.TauxiliarymaterialsCheckDto;
 import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
 import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
 import com.starcharge.wios.utils.ExcelUtils;
 import com.starcharge.wios.utils.ExcelUtils;
+import com.starcharge.wios.utils.NumberUtil;
 import com.starcharge.wios.validation.CreateEntityGroup;
 import com.starcharge.wios.validation.CreateEntityGroup;
 import com.starcharge.wios.validation.ParamsValidate;
 import com.starcharge.wios.validation.ParamsValidate;
 import com.starcharge.wios.vo.TauxiliarymaterialsExcelVo;
 import com.starcharge.wios.vo.TauxiliarymaterialsExcelVo;
@@ -77,7 +78,7 @@ public class TauxiliarymaterialsController {
         tauxiliarymaterials.setUpdatedBy(sessionInfo.getUserId());
         tauxiliarymaterials.setUpdatedBy(sessionInfo.getUserId());
         tauxiliarymaterials.setUpdatedTime(now);
         tauxiliarymaterials.setUpdatedTime(now);
         //暂时代替申请单号
         //暂时代替申请单号
-//        tauxiliarymaterials.setApplyOrder(IdWorker.getIdStr());
+        tauxiliarymaterials.setApplyOrder("FC"+NumberUtil.getRandomOrderId());
         tauxiliarymaterialsMapper.insertSelective(tauxiliarymaterials);
         tauxiliarymaterialsMapper.insertSelective(tauxiliarymaterials);
         return new BaseResponse<>(tauxiliarymaterials);
         return new BaseResponse<>(tauxiliarymaterials);
     }
     }

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

@@ -136,6 +136,9 @@
             <if test="wallboxItemId != null  and wallboxItemId != ''">and t_wallbox_apply.wallbox_item_id like
             <if test="wallboxItemId != null  and wallboxItemId != ''">and t_wallbox_apply.wallbox_item_id like
                 concat('%', #{wallboxItemId}, '%')
                 concat('%', #{wallboxItemId}, '%')
             </if>
             </if>
+            <if test="orderId != null  and orderId != ''">and t_wallbox_apply.order_id like
+                concat('%', #{orderId}, '%')
+            </if>
         </where>
         </where>
     </select>
     </select>
 
 

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

@@ -33,4 +33,8 @@ public class WallboxApplyReqVO {
     /** 物流状态0未发货，1已发货 */
     /** 物流状态0未发货，1已发货 */
     @ApiModelProperty(value = "物流状态0未发货，1已发货",  required = false)
     @ApiModelProperty(value = "物流状态0未发货，1已发货",  required = false)
     private String trackingStatus;
     private String trackingStatus;
+
+    /** 安装订单号 */
+    @ApiModelProperty(value = "安装订单号",  required = false)
+    private String orderId;
 }
 }