楚江ERP：补货单接口完善

@@ -103,6 +103,12 @@ public class GetReplenishmentOrderLineBo extends BaseBo<ReplenishmentOrderLine>
     @ApiModelProperty("排序")
     @ApiModelProperty("排序")
     private Integer showOrder;
     private Integer showOrder;
 
 
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty("前端用ID")
+    private String itemId;
+
     public GetReplenishmentOrderLineBo() {
     public GetReplenishmentOrderLineBo() {
 
 
     }
     }

@@ -18,6 +18,8 @@ import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
+import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
+import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderLineBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderLineBo;
 import com.lframework.xingyun.sc.bo.purchase.QueryReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.QueryReplenishmentOrderBo;
@@ -78,9 +80,20 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"entity:replenishmentorder:query"})
+    @HasPermission({"purchase:replenishmentorder:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryReplenishmentOrderBo>> query(@Valid QueryReplenishmentOrderVo vo) {
     public InvokeResult<PageResult<QueryReplenishmentOrderBo>> query(@Valid QueryReplenishmentOrderVo vo) {
+        if (vo != null && StringUtils.isNotBlank(vo.getCustomerName())) {
+            QueryCustomerVo queryCustomerVo = new QueryCustomerVo();
+            queryCustomerVo.setName(vo.getCustomerName());
+            List<Customer> customerList = customerService.query(queryCustomerVo);
+            if (CollectionUtils.isEmpty(customerList)) {
+                PageResult<QueryReplenishmentOrderBo> boPageResult = new PageResult<>();
+                return InvokeResultBuilder.success(boPageResult);
+            }
+
+            vo.setCustomerIdList(customerList.stream().map(Customer::getId).collect(Collectors.toList()));
+        }
 
 
         PageResult<ReplenishmentOrder> pageResult = replenishmentOrderService.query(getPageIndex(vo), getPageSize(vo), vo);
         PageResult<ReplenishmentOrder> pageResult = replenishmentOrderService.query(getPageIndex(vo), getPageSize(vo), vo);
 
 
@@ -147,7 +160,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      */
      */
     @ApiOperation("根据ID查询")
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"entity:replenishmentorder:query"})
+    @HasPermission({"purchase:replenishmentorder:query"})
     @GetMapping
     @GetMapping
     public InvokeResult<GetReplenishmentOrderBo> get(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<GetReplenishmentOrderBo> get(@NotBlank(message = "id不能为空！") String id) {
 
 
@@ -190,7 +203,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"entity:replenishmentorder:add"})
+    @HasPermission({"purchase:replenishmentorder:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateReplenishmentOrderVo vo) {
     public InvokeResult<Void> create(@Valid @RequestBody CreateReplenishmentOrderVo vo) {
 
 
@@ -203,7 +216,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"entity:replenishmentorder:modify"})
+    @HasPermission({"purchase:replenishmentorder:modify"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateReplenishmentOrderVo vo) {
     public InvokeResult<Void> update(@Valid @RequestBody UpdateReplenishmentOrderVo vo) {
 
 
@@ -218,6 +231,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 取消
      * 取消
      */
      */
     @ApiOperation("取消")
     @ApiOperation("取消")
+    @HasPermission({"purchase:replenishmentorder:cancel"})
     @GetMapping("/cancel")
     @GetMapping("/cancel")
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
 
 
@@ -232,6 +246,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 填写补货时间
      * 填写补货时间
      */
      */
     @ApiOperation("填写补货时间")
     @ApiOperation("填写补货时间")
+    @HasPermission({"purchase:replenishmentorder:fillRestockTime"})
     @PostMapping("/fillRestockTime")
     @PostMapping("/fillRestockTime")
     public InvokeResult<Void> fillRestockTime(@RequestBody UpdateReplenishmentOrderVo vo) {
     public InvokeResult<Void> fillRestockTime(@RequestBody UpdateReplenishmentOrderVo vo) {
 
 

@@ -145,6 +145,7 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
                 .set(ReplenishmentOrder::getCustomerId, vo.getCustomerId())
                 .set(ReplenishmentOrder::getCustomerId, vo.getCustomerId())
                 .set(ReplenishmentOrder::getOriginPlanShipDate, vo.getOriginPlanShipDate())
                 .set(ReplenishmentOrder::getOriginPlanShipDate, vo.getOriginPlanShipDate())
                 .set(ReplenishmentOrder::getPurchaseOrderId, vo.getPurchaseOrderId())
                 .set(ReplenishmentOrder::getPurchaseOrderId, vo.getPurchaseOrderId())
+                .set(ReplenishmentOrder::getStatus, "AUDIT")
                 .eq(ReplenishmentOrder::getId, vo.getId());
                 .eq(ReplenishmentOrder::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -20,56 +20,49 @@ public class CreateReplenishmentOrderVo implements BaseVo, Serializable {
     /**
     /**
      * 编号
      * 编号
      */
      */
-    @ApiModelProperty(value = "编号", required = true)
-    @NotBlank(message = "请输入编号！")
+    @ApiModelProperty(value = "编号")
     @Length(message = "编号最多允许50个字符！")
     @Length(message = "编号最多允许50个字符！")
     private String code;
     private String code;
 
 
     /**
     /**
      * 分厂
      * 分厂
      */
      */
-    @ApiModelProperty(value = "分厂", required = true)
-    @NotBlank(message = "请输入分厂！")
+    @ApiModelProperty(value = "分厂")
     @Length(message = "分厂最多允许32个字符！")
     @Length(message = "分厂最多允许32个字符！")
     private String workshopId;
     private String workshopId;
 
 
     /**
     /**
      * 办事处
      * 办事处
      */
      */
-    @ApiModelProperty(value = "办事处", required = true)
-    @NotBlank(message = "请输入办事处！")
+    @ApiModelProperty(value = "办事处")
     @Length(message = "办事处最多允许32个字符！")
     @Length(message = "办事处最多允许32个字符！")
     private String deptId;
     private String deptId;
 
 
     /**
     /**
      * 购货单位
      * 购货单位
      */
      */
-    @ApiModelProperty(value = "购货单位", required = true)
-    @NotBlank(message = "请输入购货单位！")
+    @ApiModelProperty(value = "购货单位")
     @Length(message = "购货单位最多允许32个字符！")
     @Length(message = "购货单位最多允许32个字符！")
     private String customerId;
     private String customerId;
 
 
     /**
     /**
      * 原计划发货日期
      * 原计划发货日期
      */
      */
-    @ApiModelProperty(value = "原计划发货日期", required = true)
-    @NotNull(message = "请输入原计划发货日期！")
+    @ApiModelProperty(value = "原计划发货日期")
     @TypeMismatch(message = "原计划发货日期格式有误！")
     @TypeMismatch(message = "原计划发货日期格式有误！")
     private LocalDate originPlanShipDate;
     private LocalDate originPlanShipDate;
 
 
     /**
     /**
      * 订货单
      * 订货单
      */
      */
-    @ApiModelProperty(value = "订货单", required = true)
-    @NotBlank(message = "请输入订货单！")
+    @ApiModelProperty(value = "订货单")
     @Length(message = "订货单最多允许32个字符！")
     @Length(message = "订货单最多允许32个字符！")
     private String purchaseOrderId;
     private String purchaseOrderId;
 
 
     /**
     /**
      * 状态
      * 状态
      */
      */
-    @ApiModelProperty(value = "状态", required = true)
-    @NotBlank(message = "请输入状态！")
+    @ApiModelProperty(value = "状态")
     @Length(message = "状态最多允许20个字符！")
     @Length(message = "状态最多允许20个字符！")
     private String status;
     private String status;
 
 

@@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 @Data
 @Data
 public class QueryReplenishmentOrderVo extends PageVo implements BaseVo, Serializable {
 public class QueryReplenishmentOrderVo extends PageVo implements BaseVo, Serializable {
@@ -30,7 +32,13 @@ public class QueryReplenishmentOrderVo extends PageVo implements BaseVo, Seriali
      * 购货单位
      * 购货单位
      */
      */
     @ApiModelProperty("购货单位")
     @ApiModelProperty("购货单位")
-    private String customerId;
+    private List<String> customerIdList;
+
+    /**
+     * 购货单位名称
+     */
+    @ApiModelProperty("购货单位名称")
+    private String customerName;
 
 
     /**
     /**
      * 创建时间
      * 创建时间
@@ -39,4 +47,15 @@ public class QueryReplenishmentOrderVo extends PageVo implements BaseVo, Seriali
     @TypeMismatch(message = "创建时间格式有误！")
     @TypeMismatch(message = "创建时间格式有误！")
     private LocalDateTime createTime;
     private LocalDateTime createTime;
 
 
+    /**
+     * 申请时间开始
+     */
+    @ApiModelProperty("申请时间开始")
+    private LocalDate applicationDateStart;
+
+    /**
+     * 申请时间结束
+     */
+    @ApiModelProperty("申请时间结束")
+    private LocalDate applicationDateEnd;
 }
 }

@@ -46,12 +46,22 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
             </if>
-            <if test="vo.customerId != null and vo.customerId != ''">
-                AND tb.customer_id = #{vo.customerId}
-            </if>
             <if test="vo.createTime != null">
             <if test="vo.createTime != null">
                 AND tb.create_time = #{vo.createTime}
                 AND tb.create_time = #{vo.createTime}
             </if>
             </if>
+            <if test="vo.customerIdList != null and vo.customerIdList.size() > 0">
+                AND tb.customer_id IN
+                <foreach collection="vo.customerIdList" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="vo.applicationDateStart != null">
+                AND tb.create_time &gt;= #{vo.applicationDateStart}
+            </if>
+            <if test="vo.applicationDateEnd != null">
+                AND tb.create_time &lt;= #{vo.applicationDateEnd}
+            </if>
         </where>
         </where>
+        order by tb.create_time desc
     </select>
     </select>
 </mapper>
 </mapper>