货单编辑接口

performance-api/src/main/java/com/clx/performance/param/pc/UpdateEditOrderGoodsParam.java

@@ -27,5 +27,5 @@ public class UpdateEditOrderGoodsParam {
 
     @Valid
     @Converted(isDynamic = true)
-    private List<OrderGoodsEditParams> orderGoodsChildParams;
+    private OrderGoodsEditParams orderGoodsParams;
 }

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsEditVO.java

@@ -38,5 +38,5 @@ public class OrderGoodsEditVO {
     @ApiModelProperty("1:可以全部编辑 0：不能全部编辑")
     private boolean editAllFlag;
 
-    private List<OrderGoodsVO> orderGoodsVOList;
+    private OrderGoodsVO orderGoodsVO;
 }

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -130,8 +130,8 @@ public class GoodsOrderController {
 
     @ApiOperation(value = "货单编辑查询", notes = "<br>By:胡宇帆")
     @GetMapping("/findOrderGoodsByBatchNumber")
-    public Result<OrderGoodsEditVO> findOrderGoodsByBatchNumber(@RequestParam(value = "batchNumber") Long batchNumber){
-        OrderGoodsEditVO orderGoodsVO = orderGoodsService.findOrderGoodsByBatchNumber(batchNumber);
+    public Result<OrderGoodsEditVO> findOrderGoodsByBatchNumber(@RequestParam(value = "id") Integer id){
+        OrderGoodsEditVO orderGoodsVO = orderGoodsService.findOrderGoodsById(id);
         return Result.ok(orderGoodsVO);
     }
 

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -64,7 +64,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight,  Integer id);
 
-    List<OrderGoodsVO> findOrderGoodsByBatchNumber(Long batchNumber);
+    OrderGoodsVO findOrderGoodsById(Integer id);
 
     List<OrderGoods> selectListByOrderGoodsList(List<String> orderNos);
 

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -170,8 +170,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public List<OrderGoodsVO> findOrderGoodsByBatchNumber(Long batchNumber) {
-        return baseMapper.findOrderGoodsByBatchNumber(batchNumber);
+    public OrderGoodsVO findOrderGoodsById(Integer id) {
+        return baseMapper.findOrderGoodsById(id);
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -59,8 +59,8 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeight")
     Integer updateOrderGoodsSetResidueWeight(@Param(value = "residueWeight") BigDecimal residueWeight, @Param(value = "id") Integer id);
 
-    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "findOrderGoodsByBatchNumber")
-    List<OrderGoodsVO> findOrderGoodsByBatchNumber(Long batchNumber);
+    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "findOrderGoodsById")
+    OrderGoodsVO findOrderGoodsById(Integer id);
 
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoods")
     Integer updateOrderGoods(@Param(value = "param") OrderGoodsEditParams orderGoodsEditParams);

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -77,8 +77,8 @@ public interface OrderGoodsService {
 
     /**
      * 编辑货单查询
-     * @param batchNumber
+     * @param id
      * @return
      */
-    OrderGoodsEditVO findOrderGoodsByBatchNumber(Long batchNumber);
+    OrderGoodsEditVO findOrderGoodsById(Integer id);
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -184,7 +184,7 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
-    public String findOrderGoodsByBatchNumber(@Param("batchNumber") Long batchNumber) {
+    public String findOrderGoodsById(@Param("id") Integer id) {
         String sql = new SQL() {{
             SELECT("a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
@@ -200,8 +200,8 @@ public class OrderGoodsSqlProvider {
                     "a.user_no,a.user_name,batch_number,last_arrive_receive_time,last_load_time,last_order_time");
             FROM("order_goods a");
 
-            if (Objects.nonNull(batchNumber)) {
-                WHERE("a.batch_number = #{batchNumber}");
+            if (Objects.nonNull(id)) {
+                WHERE("a.id = #{id}");
             }
 
             ORDER_BY("a.create_time desc");