'修改采购订单接口bug'

src/main/java/com/steerinfo/dil/service/impl/AmsPurchaseOrderServiceImpl.java

@@ -67,8 +67,6 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         BigDecimal batchId;
 //        if (amsPurchaseOrderMapper.getBatchId(map) == null) {
         DilBatch dilBatch = new DilBatch();
-        batchId = dilBatchMapper.selectBatchId();
-        dilBatch.setBatchId(batchId);
         dilBatch.setResultForeignShipName(resultForeignShipName);
         dilBatch.setMaterialId(materialId);
         dilBatch.setInsertTime(new Date());
@@ -110,7 +108,6 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         amsPurchaseOrder.setPurchaseOrderNo(purchaseOrderNo);
         amsPurchaseOrder.setPurchaseOrderBuyer(purchaseOrderBuyer);
         amsPurchaseOrder.setPuchaseOrderMaterialNumber(new BigDecimal(purchaseOrderMaterialNumber));
-        amsPurchaseOrder.setBatchId(batchId);
         amsPurchaseOrder.setSupplierUnitId(supplierId);
         amsPurchaseOrder.setReceiveUnitId(purchasingOrganizationId);
         amsPurchaseOrder.setPurchasingOrganizationId(purchasingOrganizationId);
@@ -129,6 +126,9 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         // 新增
         if (amsPurchaseOrders.size() == 0) {
             BigDecimal purchaseId = amsPurchaseOrderMapper.getPurchaseId();
+            batchId = dilBatchMapper.selectBatchId();
+            dilBatch.setBatchId(batchId);
+            amsPurchaseOrder.setBatchId(batchId);
             amsPurchaseOrder.setPurchaseOrderId(purchaseId);
             amsPurchaseOrder.setDeleted(new BigDecimal(0));
             dilBatchMapper.insertSelective(dilBatch);
@@ -136,6 +136,9 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         }
         if (amsPurchaseOrders.size() != 0 && dataStatus == 1) {
             AmsPurchaseOrder amsPurchaseOrder1 = amsPurchaseOrders.get(0);
+            batchId = dilBatchMapper.selectBatchId();
+            dilBatch.setBatchId(batchId);
+            amsPurchaseOrder.setBatchId(batchId);
             amsPurchaseOrder.setDeleted(deleted);
             amsPurchaseOrder.setPurchaseOrderId(amsPurchaseOrder1.getPurchaseOrderId());
             result = amsPurchaseOrderMapper.updateByPrimaryKeySelective(amsPurchaseOrder);

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -123,7 +123,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrder.setReceiveId(receiveId);
                 amsSaleOrder.setShipperId(shipperId);
                 if (isSelfMention != null) {
-                    if (isSelfMention.equals("自提")) {
+                    if (isSelfMention.equals("CARRY")) {
                         amsSaleOrder.setSaleOrderIsselfMention("是");
                     } else {
                         amsSaleOrder.setSaleOrderIsselfMention("否");