'修改采购接口'

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

@@ -76,7 +76,6 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         dilBatch.setInsertUsername("admin");
         dilBatch.setUpdateUsername("admin");
         dilBatch.setInsertUpdateRemark("无");
-        dilBatchMapper.insertSelective(dilBatch);
 //        }
 //        else {
 //            batchId = amsPurchaseOrderMapper.getBatchId(map);
@@ -125,17 +124,19 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         Map<String, Object> map1 = new HashMap<>();
         BigDecimal deleted = new BigDecimal(0);
         map1.put("purchaseOrderNo", purchaseOrderNo);
-        map1.put("deleted", deleted);
+//        map1.put("deleted", deleted);
         List<AmsPurchaseOrder> amsPurchaseOrders = amsPurchaseOrderMapper.selectByParameters(map1);
         // 新增
         if (amsPurchaseOrders.size() == 0) {
             BigDecimal purchaseId = amsPurchaseOrderMapper.getPurchaseId();
             amsPurchaseOrder.setPurchaseOrderId(purchaseId);
             amsPurchaseOrder.setDeleted(new BigDecimal(0));
+            dilBatchMapper.insertSelective(dilBatch);
             result = amsPurchaseOrderMapper.insertSelective(amsPurchaseOrder);
         }
         if (amsPurchaseOrders.size() != 0 && dataStatus == 1) {
             AmsPurchaseOrder amsPurchaseOrder1 = amsPurchaseOrders.get(0);
+            amsPurchaseOrder.setDeleted(deleted);
             amsPurchaseOrder.setPurchaseOrderId(amsPurchaseOrder1.getPurchaseOrderId());
             result = amsPurchaseOrderMapper.updateByPrimaryKeySelective(amsPurchaseOrder);
         }

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

@@ -57,7 +57,7 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         Map<String,Object> map = new HashMap<>();
         map.put("easConsigneeId",EASConsigneeId);
         BigDecimal deleted = new BigDecimal(0);
-        map.put("deleted",deleted);
+//        map.put("deleted",deleted);
         RmsConsignee rmsConsignee = new RmsConsignee();
         rmsConsignee.setEasConsigneeId(EASConsigneeId);
         rmsConsignee.setConsigneeCompanyName(consigneeCompanyName);
@@ -84,6 +84,7 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         if (rmsRmsConsignees.size() != 0 && dataStatus == 1) {
             RmsConsignee rmsConsignee1 = rmsRmsConsignees.get(0);
             rmsConsignee.setConsigneeId(rmsConsignee1.getConsigneeId());
+            rmsConsignee.setDeleted(deleted);
             result = rmsConsigneeMapper.updateByPrimaryKeySelective(rmsConsignee);
         }
         // 逻辑删除

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

@@ -72,7 +72,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         Map<String,Object> map1 = new HashMap<>();
         map1.put("easMaterialId",EASMaterialId);
         BigDecimal deleted = new BigDecimal(0);
-        map1.put("deleted",deleted);
+//        map1.put("deleted",deleted);
         List<RmsMaterial> rmsMaterials = rmsMaterialMapper.selectByParameters(map1);
         // 判断物资类型是否已存在
         Map<String,Object> map2 = new HashMap<>();
@@ -137,6 +137,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         // 修改
         if (rmsMaterials.size() != 0 && dataStatus == 1){
             RmsMaterial rmsMaterial1 = rmsMaterials.get(0);
+            rmsMaterial.setDeleted(deleted);
             rmsMaterial.setMaterialId(rmsMaterial1.getMaterialId());
             result = rmsMaterialMapper.updateByPrimaryKeySelective(rmsMaterial);
         }

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

@@ -66,9 +66,9 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
         map1.put("easSupplierId",EASSupplierId);
         Map<String,Object> map2 = new HashMap<>();
         BigDecimal deleted = new BigDecimal(0);
-        map1.put("deleted",deleted);
+//        map1.put("deleted",deleted);
         map2.put("easCarrierId",EASSupplierId);
-        map2.put("deleted",deleted);
+//        map2.put("deleted",deleted);
         List<RmsCarrier> rmsCarriers = rmsCarrierMapper.selectByParameters(map2);
         List<RmsSupplier> rmsSuppliers = rmsSupplierMapper.selectByParameters(map1);
         // 供应商
@@ -116,7 +116,9 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
             RmsSupplier rmsSupplier1 = rmsSuppliers.get(0);
             RmsCarrier rmsCarrier1 = rmsCarriers.get(0);
             rmsCarrier.setCarrierId(rmsCarrier1.getCarrierId());
+            rmsCarrier.setDeleted(deleted);
             rmsSupplier.setSupplierId(rmsSupplier1.getSupplierId());
+            rmsSupplier.setDeleted(deleted);
             result += rmsSupplierMapper.updateByPrimaryKeySelective(rmsSupplier);
             result += rmsCarrierMapper.updateByPrimaryKeySelective(rmsCarrier);
         }