#

zjj

2024-11-14 277ce0556ebe4bd91af10f3e4e8b69bab78947d7

#

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -80,9 +80,9 @@

            List<LocDetl> locDetls = new ArrayList<>();
            if (decimal.doubleValue() > 0){
                locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
                locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner() == 32? 0 : orderDetl.getOwner());
            }else {
                locDetls = locDetlService.queryStock3(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
                locDetls = locDetlService.queryStock3(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner() == 32? 0 : orderDetl.getOwner());
            }

            for (LocDetl locDetl : locDetls) {

 src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java

@@ -60,9 +60,9 @@
        String[] split = orderNo.split("-");
        String orderNoS = split[0];
        //登录金蝶r
        log.info("登录金蝶");
//        log.info("登录金蝶");
        ReturnT<String> start = loginAuthenticationHandler.start();
        log.info("登录金蝶:start:"+start);
//        log.info("登录金蝶:start:"+start);
        DocType docType = docTypeService.selectById(order.getDocType());
        if (null == docType) {
            return SUCCESS;

 src/main/resources/mapper/LocDetlMapper.xml

@@ -148,14 +148,14 @@
        left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
        where 1=1
        and b.loc_sts = 'F'
        <choose>
            <when test="owner != null and owner != 0">
                and owner = #{owner}
            </when>
            <otherwise>
                and 1!=1
            </otherwise>
        </choose>
<!--        <choose>-->
<!--            <when test="owner != null and owner != 0">-->
<!--                and owner = #{owner}-->
<!--            </when>-->
<!--            <otherwise>-->
<!--                and 1!=1-->
<!--            </otherwise>-->
<!--        </choose>-->
<!--        <choose>-->
<!--            <when test="payment != null and payment != 0">-->
<!--                and payment = #{payment}-->
@@ -175,14 +175,14 @@
        left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
        where 1=1
        and b.loc_sts = 'F'
        <choose>
            <when test="owner != null and owner != 0">
                and owner = #{owner}
            </when>
            <otherwise>
                and 1!=1
            </otherwise>
        </choose>
<!--        <choose>-->
<!--            <when test="owner != null and owner != 0">-->
<!--                and owner = #{owner}-->
<!--            </when>-->
<!--            <otherwise>-->
<!--                and 1!=1-->
<!--            </otherwise>-->
<!--        </choose>-->
<!--        <choose>-->
<!--            <when test="payment != null and payment != 0">-->
<!--                and payment = #{payment}-->
@@ -278,14 +278,14 @@
<!--            </otherwise>-->
<!--        </choose>-->

        <choose>
            <when test="owner != null and owner !=0">
                and a.owner = #{owner}
            </when>
            <otherwise>
                and 1!=1
            </otherwise>
        </choose>
<!--        <choose>-->
<!--            <when test="owner != null and owner !=0">-->
<!--                and a.owner = #{owner}-->
<!--            </when>-->
<!--            <otherwise>-->
<!--                and 1!=1-->
<!--            </otherwise>-->
<!--        </choose>-->

        order by
        DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
@@ -448,14 +448,14 @@
        <!--            </otherwise>-->
        <!--        </choose>-->

        <choose>
            <when test="owner != null and owner !=0">
                and a.owner = #{owner}
            </when>
            <otherwise>
                and 1!=1
            </otherwise>
        </choose>
<!--        <choose>-->
<!--            <when test="owner != null and owner !=0">-->
<!--                and a.owner = #{owner}-->
<!--            </when>-->
<!--            <otherwise>-->
<!--                and 1!=1-->
<!--            </otherwise>-->
<!--        </choose>-->

        order by
        a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
@@ -661,14 +661,14 @@
            </otherwise>
        </choose>

        <choose>
            <when test="owner != null and owner !=0">
                and a.owner = #{owner}
            </when>
            <otherwise>
                and 1!=1
            </otherwise>
        </choose>
<!--        <choose>-->
<!--            <when test="owner != null and owner !=0">-->
<!--                and a.owner = #{owner}-->
<!--            </when>-->
<!--            <otherwise>-->
<!--                and 1!=1-->
<!--            </otherwise>-->
<!--        </choose>-->

        order by
        a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme

 src/main/webapp/views/order/order.html

@@ -62,6 +62,7 @@
                                <option value="2">作业中</option>
                                <option value="4">已完成</option>
                                <option value="6">上报完成</option>
                                <option value="7">上报失败</option>
                            </select>
                        </div>
                    </div>