#

whycq

2023-09-26 777e8033c4acaafe3657ec997e13b8696db2a42f

#

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -409,8 +409,49 @@
    public synchronized R pickAuth(@RequestBody String barcode){
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        //WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
        //List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        return R.ok().add(wrkDetls);
    }

    @RequestMapping("/order/search/orderNo/auth/v2")
    @ManagerAuth
    public R orderSearchByBarcodeV2(@RequestParam String orderNo){
        if (Cools.isEmpty(orderNo)){
            orderNo=null;
        }
        List<Order> orders = orderService.selectOrderNoL(orderNo);
        if (Cools.isEmpty(orders)){
            return R.ok();
        }
        LinkedList<CombParam> combParams = new LinkedList<>();
        if (!Cools.isEmpty(orders)){
            for (Order order:orders){
                CombParam combParam=new CombParam();
                if (order == null) {
                    continue;
                }
                DocType docType = docTypeService.selectById(order.getDocType());
                if (docType.getPakin() == null || docType.getPakin() != 1) {
                    continue;
                }
                if (order.getSettle() > 2) {
                    continue;
                }
                List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
                if (!Cools.isEmpty(orderDetls)) {
                    LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
                    for (OrderDetl orderDetl:orderDetls){
                        CombParam.CombMat combMat = new CombParam.CombMat();
                        combMat.setMatnr(orderDetl.getMatnr());
                        combMat.setBatch(orderDetl.getBatch());
                        combMat.setAnfme(orderDetl.getAnfme());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
                }
                combParam.setOrderNo(order.getOrderNo());
                combParams.add(combParam);
            }
        }
        return R.ok().add(combParams);
    }
}

 src/main/java/com/zy/asrs/mapper/OrderMapper.java

@@ -18,4 +18,7 @@

    List<Order> selectToBeHistoryOrder();

    List<Order> selectOrderNoL(@Param("orderNo")String orderNo);


}

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -35,4 +35,6 @@
     * @return
     */
    List<Order> selectToBeHistoryOrder();

    List<Order> selectOrderNoL(String orderNo);
}

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -227,4 +227,9 @@
    public List<Order> selectToBeHistoryOrder() {
        return this.baseMapper.selectToBeHistoryOrder();
    }

    @Override
    public List<Order> selectOrderNoL(String orderNo) {
        return this.baseMapper.selectOrderNoL(orderNo);
    }
}

 src/main/resources/mapper/OrderMapper.xml

@@ -70,4 +70,13 @@
        order by create_time asc
    </select>

    <select id="selectOrderNoL" resultMap="BaseResultMap">
        select *
        from man_order
        where 1=1
        <if test="orderNo != null">
            and order_no = #{orderNo}
        </if>
    </select>

</mapper>