#
Junjie
2024-06-03 312e4a25f2c96e8349369cf1838c79b34f816ca5
#
5个文件已修改
28 ■■■■■ 已修改文件
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
@@ -31,4 +31,6 @@
    int increaseWorkQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty, @Param("hostId") Long hostId);
    int increaseWorkQty(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("workQty") Double workQty, @Param("hostId") Long hostId);
}
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java
@@ -22,4 +22,6 @@
    boolean increaseWorkQtyByOrderNo(String orderNo, String matnr, String batch, Double qty, Long hostId);
    boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty, Long hostId);
}
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java
@@ -53,4 +53,9 @@
    public boolean increaseWorkQtyByOrderNo(String orderNo, String matnr, String batch, Double qty, Long hostId) {
        return this.baseMapper.increaseWorkQtyByOrderNo(orderNo, matnr, batch, qty, hostId) > 0;
    }
    @Override
    public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty, Long hostId) {
        return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty, hostId) > 0;
    }
}
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -484,7 +484,7 @@
                throw new CoolException("保存工作档明细失败");
            }
            // 修改订单明细
            if (!orderDetlService.increase(orderDetl.getOrderId(), hostId, orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
            if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(), hostId)) {
                throw new CoolException("修改订单明细数量失败");
            }
            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId, hostId);
zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
@@ -136,4 +136,21 @@
        </choose>
    </update>
    <update id="increaseWorkQty">
        update man_order_detl
        set work_qty = work_qty + #{workQty}
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}
        and host_id = #{hostId}
        <choose>
            <when test="batch != null and batch != ''">
                and batch = #{batch}
            </when>
            <otherwise>
                and (batch IS NULL OR batch = '')
            </otherwise>
        </choose>
    </update>
</mapper>