切换分支备份

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -500,6 +500,33 @@ public class IoOrderController extends BaseController {
     }
 
 
+    /**
+     * PDA获取获取单据列表
+     *
+     * @param filterOrderRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/order/pda/list")
+    public BaseResponse pdaListOrder(@RequestBody FilterOrderRequest filterOrderRequest) {
+
+        if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
+            orderService.setFilterStatus(filterOrderRequest);
+        }
+        if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
+            orderService.setActions(filterOrderRequest);
+            if (CollUtil.isEmpty(filterOrderRequest.getActions())) {
+                PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(new ArrayList<>());
+                return ResultVOUtils.page(pageInfo);
+            }
+        }
+        List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
+        if (CollUtil.isEmpty(list))
+            return ResultVOUtils.error(500, "未查询到单据");
+        return ResultVOUtils.success(list);
+    }
+
+
     /**
      * PDA获取待校验、待配货等单据
      *

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -94,10 +94,20 @@ public class IoOrderDetailBizController extends BaseController {
     ReceivedetailService receivedetailService;
     @Resource
     IBasicBusTypeChangeService basicBusTypeChangeService;
-
     @Resource
     IoOrderInvoiceService ioOrderInvoiceService;
-
+    @Resource
+    SupProductService supProductService;
+    @Resource
+    SystemParamConfigService systemParamConfigService;
+    @Resource
+    SupCertService supCertService;
+    @Resource
+    ThrOrderDetailService thrOrderDetailService;
+    @Resource
+    ThrSystemBusApiService thrSystemBusApiService;
+    @Resource
+    UdiRlSupService udiRlSupService;
 
     //获取单据业务详情---临时接口查询
     @AuthRuleAnnotation("")
@@ -110,12 +120,14 @@ public class IoOrderDetailBizController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @Resource
-    SupProductService supProductService;
-    @Resource
-    SystemParamConfigService systemParamConfigService;
-    @Resource
-    SupCertService supCertService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("udiwms/inout/order/biz/detail")
+    public BaseResponse getOrderBizDetail(String billNo) {
+        List<IoOrderDetailBizEntity> orderEntityList = orderDetailBizService.findByOrderId(billNo);
+        return ResultVOUtils.success(orderEntityList);
+    }
+
 
     //录入业务单据详情
     @AuthRuleAnnotation("")
@@ -221,13 +233,6 @@ public class IoOrderDetailBizController extends BaseController {
     }
 
 
-    @Resource
-    ThrOrderDetailService thrOrderDetailService;
-    @Resource
-    ThrSystemBusApiService thrSystemBusApiService;
-    @Resource
-    UdiRlSupService udiRlSupService;
-
     //选入第三方单据至业务单据
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/addThrOrder")

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -200,4 +200,5 @@ public class FilterOrderRequest extends ListPageRequest {
     private String keyWords;
     private Integer confirmStatus;
     private Boolean filterSelected;
+    private List<String> inOrders;
 }

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -688,7 +688,7 @@ public class IoAddInoutService {
         int count = 0;
         if (filterList != null) {
             for (IoCodeTempEntity temp : filterList) {
-                if (temp.getCode().equals(codeEntity.getCode())) {
+                if (temp.getCode().equals(codeEntity.getCode()) && StrUtil.trimToEmpty(temp.getSerialNo()).equals(StrUtil.trimToEmpty(codeEntity.getSerialNo()))) {
                     count = count + 1;
                 }
             }

src/main/java/com/glxp/api/task/SyncHeartTask.java

@@ -20,8 +20,8 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 @Slf4j
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
 public class SyncHeartTask implements SchedulingConfigurer {
 
     @Resource

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -106,6 +106,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="inOrders != null and inOrders.size() != 0">
+                AND io.billNo in
+                <foreach collection="inOrders" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="orderIds != null and orderIds.size() != 0">
                 AND io.billNo in
                 <foreach collection="orderIds" index="index" item="item" open="(" close=")" separator=",">