自动化立体仓库 - WMS系统
816a6d9ad8c5af8d0bda2ceae3a26f1b1cc9320f..025f88f0025ce0be4609b763e5cdc9a86be42144
8 天以前 IZCD4L12RTSW0VZ\Administrator
Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
025f88 对比 | 目录
8 天以前 IZCD4L12RTSW0VZ\Administrator
no message
e06af7 对比 | 目录
8 天以前 skyouc
no message
a544ea 对比 | 目录
3个文件已修改
11 ■■■■ 已修改文件
src/main/java/com/zy/api/entity/StockAdjustParams.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/OrderMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/api/entity/StockAdjustParams.java
@@ -13,7 +13,7 @@
public class StockAdjustParams extends OrderParams {
    @ApiModelProperty("调整原因")
    private String resason;
    private String reason;
    @ApiModelProperty("调整原因名称")
    private String reason_name;
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -532,10 +532,11 @@
        adjustParam.setCompany_id(order.getCstmrName())
                .setWms_id(order.getId() + "")
                .setType(0 + "")
                .setCompany_id(order.getCstmrName());
                .setUpdate_time(order.getUpdateBy$())
                .setKopen_id(order.getDefNumber());
        adjustParam.setBsby_no(order.getNumber())
                .setResason("")
        adjustParam.setBsby_no(order.getOrderNo())
                .setReason("")
                .setReason_name("");
        List<CheckOrderDetl> detls = checkOrderDetlService
                .selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", order.getId()));
src/main/resources/mapper/OrderMapper.xml
@@ -118,7 +118,7 @@
        and move_status = 1
        order by update_time
    </select>
    <select id="selectCompleteCheck" resultType="com.zy.asrs.entity.Order">
    <select id="selectCompleteCheck" resultType="com.zy.asrs.entity.CheckOrder">
        SELECT TOP
            20 *
        FROM