无码收货搜索条件

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java

@@ -658,7 +658,7 @@ public class NormalPGIController extends BaseController {
     public ApiResult<List<BarcodeLessReceivingVO>> getDeliveryByNoScan(@Valid @RequestBody BarcodeLessReceivingSearchQO request) {
         List<BarcodeLessReceivingVO> list = new ArrayList<>();
         List<WmsSrmOrder> orders = null;
-        if (Objects.isNull(request.getId()) && request.getId() > 0) {
+        if (Objects.nonNull(request.getId()) && request.getId() > 0) {
             orders = wmsSrmOrderService.lambdaQuery()
                     .eq(WmsSrmOrder::getId, request.getId())
                     .eq(WmsSrmOrder::getIsCompleted, false)

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageOrderMapper">
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
-        SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
+        SELECT o.*,m."no"||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
         ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo"
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
@@ -24,7 +24,7 @@
                 and o.external_order_no=#{request.externalOrderNo}
             </if>
             <if test="request.workbenchCode!=null and request.workbenchCode!=''">
-                and wb."no" ilike concat('%', #{request.workbenchCode}, '%')
+                and m."no"||wb."no" ilike concat('%', #{request.workbenchCode}, '%')
             </if>
             <if test="request.startDate!=null">
                 and o.create_time>= #{request.startDate}