#

1

1 天以前 d953e40c7badd8be505d133ae1bb410e4024229f

#

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

@@ -577,17 +577,14 @@
                                        }
                                        Double erpAnfme = anfme*mat.getSafeQty();
                                        Order order1 = orderService.selectByNo( billNo);
                                        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order1.getId());
                                        boolean sign = false;
                                        for (OrderDetl orderDetl : orderDetls){
                                            if (orderDetl.getMatnr().equals(matnr)){
                                                sign = true;
                                                break;
                                            }
                                        }
                                        if (sign){
                                            continue;
                                        }
                                        List<OrderDetl> orderDetls =
                                                orderDetlService.selectByOrderId(order.getId());
                                        boolean exists = orderDetls.stream()
                                                .anyMatch(o ->
                                                        o.getMatnr().equals(matnr) &&
                                                                o.getBoxType3().equals(pOrderNo)
                                                );
                                        if (exists) continue;
                                        LocSupp locSupp = null;
                                        String supp =null;
                                        locSupp = locSuppService.selectByUuid(suppCode);

 src/main/resources/application.yml

@@ -107,7 +107,7 @@
    ReviewOrderSwitch: true
  #  地址
  address:
    URL: https://shyucheng.test.kdgalaxy.com
    URL: https://shyucheng.kdgalaxy.com/
    #登录地址
    loginaddress: /kapi/oauth2/getToken
    #商品档案地址
@@ -176,8 +176,8 @@
    imMdcOmprdinbillBatchAudit: /kapi/v2/im/im_mdc_omprdinbill/batchAudit
  #  登录账号管理
  login :
    xAcfwIdentity: "djF8MTlhNTNhZjJhOWEwMWRlODhlMDF8NDkxNTk0MDU4MTQxNXwus9WaEHKRh0daJe1TWmVoMkv3zQY2knNTZRzaOhRgwnw"
    xAcfwIdentity: "djF8MTlkMjllNzhjNDIwMTUwMzk0MDF8NDkyODEyNDUzNzMzM3xW-C9bLLZxtyzdBOu24fegjNWenhJEuRRBO6MjoKWF4nw="
    clientId: "WMS"
    clientSecret: "123456789Asd!@123456789"
    accountId: "2182793143735298048"
    accountId: "2182793143190120448"
    username: "admin"

 src/main/resources/license.lic

Binary files differ

 src/main/resources/mapper/OrderDetlPakinMapper.xml

@@ -138,6 +138,7 @@
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}
        and box_type3 = #{boxType3}
<!--        <include refid="standbyAll"></include>-->
    </select>


 src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html

@@ -871,7 +871,7 @@
                            beforeClose: (action, instance, done) => {
                                if (action === 'confirm') {
                                    instance.confirmButtonLoading = true;
                                    this.confirmReport(orderNo, done);
                                    this.confirmReport(orderNo, instance, done);
                                } else {
                                    done();
                                }
@@ -888,13 +888,21 @@
            },

            // 确认上报
            confirmReport(orderNo, done) {
            confirmReport(orderNo, instance, done) {
                this.reportLoading = true;
                const finish = () => {
                    this.reportLoading = false;
                    if (instance) {
                        instance.confirmButtonLoading = false;
                    }
                    if (typeof done === 'function') {
                        done();
                    }
                };

                const rowsToIssue = (this.tableDataB || []).filter(item => parseInt(item.inspect) === 1);
                if (rowsToIssue.length === 0) {
                    this.reportLoading = false;
                    if (typeof done === 'function') done();
                    finish();
                    this.$message.error('没有待下发项');
                    return;
                }
@@ -926,8 +934,7 @@
                Promise.all(updates).then(results => {
                    const failed = results.find(r => !r.ok);
                    if (failed) {
                        this.reportLoading = false;
                        if (typeof done === 'function') done();
                        finish();
                        this.$message.error(failed.msg || '同步beBatch失败');
                        return;
                    }
@@ -938,8 +945,7 @@
                        data: { orderNo: orderNo },
                        method: 'POST',
                        success: (res) => {
                            this.reportLoading = false;
                            if (typeof done === 'function') done();
                            finish();
                            if (res.code === 200 || res.success) {
                                this.$message({
                                    message: `订单号 ${orderNo} 下发成功`,
@@ -956,8 +962,7 @@
                            }
                        },
                        error: (error) => {
                            this.reportLoading = false;
                            if (typeof done === 'function') done();
                            finish();
                            console.error('下发失败:', error);
                            this.$message.error('下发失败，请检查网络连接');
                        }