Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API

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,8 +136,12 @@ 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());
+            dilBatchMapper.insertSelective(dilBatch);
             result = amsPurchaseOrderMapper.updateByPrimaryKeySelective(amsPurchaseOrder);
         }
         if (amsPurchaseOrders.size() != 0 && dataStatus == 2) {

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

@@ -2,8 +2,10 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.AmsSaleMaterialMapper;
 import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
+import com.steerinfo.dil.mapper.RmsConsigneeMapper;
 import com.steerinfo.dil.model.AmsSaleMaterial;
 import com.steerinfo.dil.model.AmsSaleOrder;
+import com.steerinfo.dil.model.RmsConsignee;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     private AmsSaleOrderMapper amsSaleOrderMapper;
     @Autowired
     AmsSaleMaterialMapper amsSaleMaterialMapper;
+    @Autowired
+    RmsConsigneeMapper rmsConsigneeMapper;
 
     /**
      * 查询销售订单
@@ -100,7 +104,22 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             String isSelfMention = (String) mapVal.get("isSelfMention");
             // 得到收货单位
             String receiveUnit = (String) mapVal.get("receiveUnit");
+            // 得到收货单位名称
+            String receiveUnitName = (String) mapVal.get("receiveUnitName");
             BigDecimal receiveId = amsSaleOrderMapper.getReceiveId(receiveUnit);
+            // 如果不存则自己增收获单位
+            if (receiveId == null) {
+                RmsConsignee rmsConsignee = new RmsConsignee();
+                BigDecimal consigneeId = rmsConsigneeMapper.getConsigneeId();
+                rmsConsignee.setConsigneeId(consigneeId);
+                rmsConsignee.setConsigneeCode(receiveUnit);
+                rmsConsignee.setConsigneeCompanyName(receiveUnitName);
+                rmsConsignee.setDeleted(new BigDecimal(0));
+                rmsConsignee.setInsertTime(new Date());
+                rmsConsignee.setInsertUsername("销售订单");
+                rmsConsignee.setInsertUpdateRemark("通过销售订单自增");
+                rmsConsigneeMapper.insertSelective(rmsConsignee);
+            }
             // 得到发货单位
             String shipperUnit = (String) mapVal.get("shipperUnit");
             BigDecimal shipperId = amsSaleOrderMapper.getShipperId(shipperUnit);

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

@@ -55,7 +55,7 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         Integer dataStatus = (Integer) mapVal.get("dataStatus");
         // 判断是否EASId已存在
         Map<String,Object> map = new HashMap<>();
-        map.put("easConsigneeId",EASConsigneeId);
+        map.put("consigneeCode",consigneeCode);
         BigDecimal deleted = new BigDecimal(0);
 //        map.put("deleted",deleted);
         RmsConsignee rmsConsignee = new RmsConsignee();

src/main/resources/application-dev.yml

@@ -3,7 +3,6 @@ spring:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
     password: Dil123789
     username: dil
-
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dal-dazhou-join-api

src/main/resources/bootstrap.yml

@@ -41,7 +41,7 @@ redis:
   database: 0
 
 openfeign:
-#正式环境
+  #正式环境
   imFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}