From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 29 九月 2025 13:34:21 +0800 Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态,显示清楚 (完成) 4. 站点保存报错, 修改人,创建人员显示 错误(完成) 5. agv入库不显示 历史库位记录 (完成) 6. 任务类型,应该为入库 (完成) --- src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java index 51c99ad..2325909 100644 --- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java +++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java @@ -13,9 +13,17 @@ @Repository public interface OrderDetlMapper extends BaseMapper<OrderDetl> { - OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch); + OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand, + @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3 + , @Param("boxType1")String boxType1, + @Param("boxType2")String boxType2, + @Param("boxType3")String boxType3); - OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch); + OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand, + @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3 + , @Param("boxType1")String boxType1, + @Param("boxType2")String boxType2, + @Param("boxType3")String boxType3); List<OrderDetl> selectWorkingDetls(Long orderId); @@ -23,15 +31,35 @@ Integer getPakoutPageCount(Map<String, Object> map); - int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty); + int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, + @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3 + , @Param("boxType1")String boxType1, + @Param("boxType2")String boxType2, + @Param("boxType3")String boxType3, @Param("qty")Double qty); - int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty); + int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, + @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3 + , @Param("boxType1")String boxType1, + @Param("boxType2")String boxType2, + @Param("boxType3")String boxType3, @Param("qty")Double qty); int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status); int addToLogTable(OrderDetl orderDetl); - int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty); + int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, + @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3 + , @Param("boxType1")String boxType1, + @Param("boxType2")String boxType2, + @Param("boxType3")String boxType3, @Param("qty")Double qty); - int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty); + int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, + @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3 + , @Param("boxType1")String boxType1, + @Param("boxType2")String boxType2, + @Param("boxType3")String boxType3, @Param("workQty")Double workQty); + int increaseWorkQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty); + + int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("workQty")Double workQty); + } -- Gitblit v1.9.1