feat: 增加上货记录

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

@@ -931,5 +931,26 @@ public class IoOrderDetailBizController extends BaseController {
         IoOrderEntity orderEntity = orderDetailBizService.addWarlockBagProduct(addWarlockBagProductReqeust);
         return ResultVOUtils.success(orderEntity);
     }
+
+
+    /**
+     * 获取上货记录
+     * @param orderDetailBizRequest
+     * @param bindingResult
+     * @return
+     */
+    @GetMapping("/udiwms/inout/bizDetail/orderOutRecordPage")
+    public BaseResponse orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest,
+                BindingResult bindingResult) {
+            if (bindingResult.hasErrors()) {
+                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+            }
+        List<IoOrderDetailBizResponse> ioOrderDetailBizResponses = orderDetailBizService.orderOutRecordPage(orderDetailBizRequest);
+        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(ioOrderDetailBizResponses);
+        PageSimpleResponse<IoOrderDetailBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(ioOrderDetailBizResponses);
+            return ResultVOUtils.success(pageSimpleResponse);
+        }
 }
 

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -47,4 +47,6 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
      * @return
      */
     IoOrderDetailBizEntity selectOrderDetailBiz(@Param("orderId") String orderId, @Param("relId") Long relId, @Param("batchNo") String batchNo, @Param("productDate") String productDate, @Param("expireDate") String expireDate);
+
+    List<IoOrderDetailBizResponse> orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest);
 }

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

@@ -32,6 +32,11 @@ public class FilterOrderDetailBizRequest extends ListPageRequest {
      */
     private String productName;
     private String keyWords;
+    private String action;
+    private String nameCode;
+    private String cpmctymc;
+    private String ggxh;
+    private String workPlaceCode;
 
     private Long bizIdFk;
 }

src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java

@@ -197,5 +197,6 @@ public class IoOrderDetailBizResponse {
      * 最小包装单位
      */
     private String leastPackUnit;
+    private String updateTime;
 
 }

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

@@ -65,4 +65,6 @@ public interface IoOrderDetailBizService {
 
 
     IoOrderEntity addWarlockBagProduct(AddWarlockBagProductReqeust addWarlockBagProductReqeust);
+
+    List<IoOrderDetailBizResponse> orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest);
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -362,6 +362,17 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return orderEntity;
     }
 
+    @Override
+    public List<IoOrderDetailBizResponse> orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest) {
+        if (null == orderDetailBizRequest) {
+            return Collections.emptyList();
+        }
+        if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) {
+            PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit());
+        }
+        return ioOrderDetailBizDao.orderOutRecordPage(orderDetailBizRequest);
+    }
+
     @Override
     public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) {
         QueryWrapper<IoOrderDetailBizEntity> ew = new QueryWrapper<>();

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

@@ -181,4 +181,43 @@
         </where>
         group by io_order_detail_result.id
     </select>
+
+
+        <select id="orderOutRecordPage" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
+        select io_order_detail_biz.*,
+                io.action,
+                io.updateTime
+        from io_order_detail_biz
+        left join io_order io on io.billNo = io_order_detail_biz.orderIdFk
+        <where>
+            AND ( io.action  = 'SC72197936495755' OR io.action  = 'SC72249388338364' )
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="action != null and action != ''">
+                AND io.action = #{action}
+            </if>
+            <if test="productName != null and productName != ''">
+                AND io_order_detail_biz.coName like concat('%', #{productName}, '%')
+            </if>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND io_order_detail_biz.coName like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND io_order_detail_biz.nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="ggxh != null and ggxh != ''">
+                AND io_order_detail_biz.spec like concat('%', #{ggxh}, '%')
+            </if>
+            <if test="keyWords != null and keyWords != ''">
+                AND (
+                io_order_detail_biz.coName like concat('%', #{keyWords}, '%')
+                OR io_order_detail_biz.spec like concat('%', #{keyWords}, '%')
+                OR io_order_detail_biz.batchNo like concat('%', #{keyWords}, '%')
+                )
+            </if>
+        </where>
+        order by updateTime desc
+    </select>
+
 </mapper>