feat: 扫码出库修改为扫码发货

gongchunyi

2 天以前 6ef4265f1859e88e3e5ff22ef1848e12fa849e26

 src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java

@@ -30,7 +30,6 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ShippingInfoService;
import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
@@ -90,9 +89,6 @@
    @Autowired
    private SalesLedgerMapper salesLedgerMapper;

    @Autowired
    @Lazy
    private ShippingInfoService shippingInfoService;
    @Autowired
    @Lazy
    private ISalesLedgerService salesLedgerService;
@@ -263,26 +259,28 @@
        }
        // 出库审批修改 (订单级别)
        if(approveProcess.getApproveType().equals(7)){
            String[] split = approveProcess.getApproveReason().split(":");
            if (split.length > 1) {
                String identifier = split[1];
                // 查找销售台账
                SalesLedger salesLedger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
                        .eq(SalesLedger::getSalesContractNo, identifier)
                        .last("limit 1"));
            String scanRemark = approveProcess.getApproveRemark();
            if (org.springframework.util.StringUtils.hasText(scanRemark) && scanRemark.startsWith("SCAN_SHIP_DELIVERY_JSON:")) {
                salesLedgerService.onScanShipDeliveryApproveOutcome(approveProcess, status);
            } else {
                String[] split = approveProcess.getApproveReason().split(":");
                if (split.length > 1) {
                    String identifier = split[1];
                    SalesLedger salesLedger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
                            .eq(SalesLedger::getSalesContractNo, identifier)
                            .last("limit 1"));

                if (salesLedger != null) {
                    if(status.equals(2)){
                        // 审批完成 -> 修改状态为审核通过，不扣除库存 (扣除库存移至发货台账补充信息阶段)
                        updateSalesLedgerDeliveryStatus(salesLedger.getId(), 4);
                        updateShippingInfoStatusByOrder(salesLedger.getId(), "审核通过");
                    } else if(status.equals(3)){
                        updateSalesLedgerDeliveryStatus(salesLedger.getId(), 3);
                        // 更新关联的发货记录为审核拒绝
                        updateShippingInfoStatusByOrder(salesLedger.getId(), "审核拒绝");
                    } else if(status.equals(1)){
                        updateSalesLedgerDeliveryStatus(salesLedger.getId(), 2);
                        updateShippingInfoStatusByOrder(salesLedger.getId(), "审核中");
                    if (salesLedger != null) {
                        if(status.equals(2)){
                            updateSalesLedgerDeliveryStatus(salesLedger.getId(), 4);
                            updateShippingInfoStatusByOrder(salesLedger.getId(), "审核通过");
                        } else if(status.equals(3)){
                            updateSalesLedgerDeliveryStatus(salesLedger.getId(), 3);
                            updateShippingInfoStatusByOrder(salesLedger.getId(), "审核拒绝");
                        } else if(status.equals(1)){
                            updateSalesLedgerDeliveryStatus(salesLedger.getId(), 2);
                            updateShippingInfoStatusByOrder(salesLedger.getId(), "审核中");
                        }
                    }
                }
            }