楚江ERP-订货单变更审核通过后数据同步bug修复

@@ -336,7 +336,12 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         // 更新状态
         updateStatus(id, "PASS");
         // 更新订货单数据
-        purchaseOrderInfoService.update(JsonUtil.parseObject(JsonUtil.toJsonString(record), PurchaseOrderInfo.class));
+        PurchaseOrderInfo orderInfo = JsonUtil.parseObject(JsonUtil.toJsonString(record), PurchaseOrderInfo.class);
+        orderInfo.setId(record.getOrderId());
+        if (record.getAfterTotalQuantity() != null) {
+            orderInfo.setTotalQuantity(new BigDecimal(record.getAfterTotalQuantity()));
+        }
+        purchaseOrderInfoService.update(orderInfo);
         // 更新订货单物料行数据
         purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
     }

@@ -439,6 +439,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderInfo::getDeliveryMethod, StringUtil.isBlank(orderInfo.getDeliveryMethod()) ? null : orderInfo.getDeliveryMethod())
                 .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(orderInfo.getPriceListNo()) ? null : orderInfo.getPriceListNo())
                 .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(orderInfo.getExecutionStandard()) ? null : orderInfo.getExecutionStandard())
+                .set(PurchaseOrderInfo::getExecutionStandardRemarks, StringUtil.isBlank(orderInfo.getExecutionStandardRemarks()) ? null : orderInfo.getExecutionStandardRemarks())
                 .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(orderInfo.getInvoicingStatus()) ? null : orderInfo.getInvoicingStatus())
                 .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(orderInfo.getShippingCost()) ? null : orderInfo.getShippingCost())
                 .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(orderInfo.getPieceWeightHeader()) ? null : orderInfo.getPieceWeightHeader())
@@ -447,11 +448,13 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderInfo::getPerformance, StringUtil.isBlank(orderInfo.getPerformance()) ? null : orderInfo.getPerformance())
                 .set(PurchaseOrderInfo::getElement, StringUtil.isBlank(orderInfo.getElement()) ? null : orderInfo.getElement())
                 .set(PurchaseOrderInfo::getPackaging, StringUtil.isBlank(orderInfo.getPackaging()) ? null : orderInfo.getPackaging())
+                .set(PurchaseOrderInfo::getPackagingFee, orderInfo.getPackagingFee() == null ? null : orderInfo.getPackagingFee())
                 .set(PurchaseOrderInfo::getRemarks, StringUtil.isBlank(orderInfo.getRemarks()) ? null : orderInfo.getRemarks())
                 .set(PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(orderInfo.getProductionProcess()) ? null : orderInfo.getProductionProcess())
                 .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(orderInfo.getDeptId()) ? null : orderInfo.getDeptId())
                 .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(orderInfo.getWorkshopId()) ? null : orderInfo.getWorkshopId())
                 .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(orderInfo.getCustomerCreditId()) ? null : orderInfo.getCustomerCreditId())
+                .set(PurchaseOrderInfo::getTotalQuantity, orderInfo.getTotalQuantity() == null ? null : orderInfo.getTotalQuantity())
                 .set(PurchaseOrderInfo::getSpecChangeStatus, OrderSpecChangeStatus.COMPLETED.getCode())
                 .eq(PurchaseOrderInfo::getId, orderInfo.getId());
         getBaseMapper().update(updateWrapper);

@@ -86,7 +86,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             String[] split = deptId.split(",");
             if (split.length > 1) {
                 StringBuilder builder = new StringBuilder();
-                for (int i = 1; i < split.length; i++) {
+                for (int i = 0; i < split.length; i++) {
                     builder.append(split[i]);
                     builder.append(",");
                 }