Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

@@ -41,8 +41,8 @@ public class IoCollectOrderBackupController extends BaseController {
     private BasicCollectUserService basicCollectUserService;
 
 
-    @GetMapping("/udiwms/basic/collect/orderFinish/filter")
+    @PostMapping("/udiwms/basic/collect/orderFinish/filter")
-    public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
+    public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
 
         List<Long> workPlaceCodes = null;
         List<UserWorkResponse> page;
@@ -97,7 +97,7 @@ public class IoCollectOrderBackupController extends BaseController {
     public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) {
         if (StrUtil.isEmpty(collectOrderRequest.getBillNo()))
             return ResultVOUtils.error(500, "单据号不能为空");
-        Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(),getUser());
+        Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), getUser());
         if (!aBoolean) {
             return ResultVOUtils.error("上传失败");
         }
@@ -107,6 +107,7 @@ public class IoCollectOrderBackupController extends BaseController {
 
     /**
      * 通过业务外键获取码明细
+     *
      * @param collectOrderBizRequest
      * @return
      */

src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java

@@ -25,7 +25,13 @@ public class SysWorkplacePutRelService extends ServiceImpl<SysWorkplacePutRelMap
     @Resource
     private SysWorkplacePutRelMapper sysWorkplacePutRelMapper;
 
-
+    /**
+     * 通过采集工位获取上货工位
+     *
+     * @param workPlaceCode
+     * @param busType
+     * @return
+     */
     public SysWorkplacePutRel findPutWorkPlace(Long workPlaceCode, String busType) {
         List<SysWorkplacePutRel> sysWorkplacePutRelList = list(new LambdaQueryWrapper<SysWorkplacePutRel>().eq(SysWorkplacePutRel::getCollectWorkCode, workPlaceCode).eq(busType != null, SysWorkplacePutRel::getCollectBusType, busType));
         if (CollUtil.isNotEmpty(sysWorkplacePutRelList))