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

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

@@ -51,19 +51,8 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
     @Transactional
     @Override
     public int insert(Map<String,Object> mapValue) {
-        BigDecimal requirementId=new BigDecimal(mapValue.get("requirementId").toString());
-        AmstruckRequirementPlan amstruckRequirementPlan = new AmstruckRequirementPlan();
-        BigDecimal planId=amstruckInwardPlanMapper.selectOtherId();
-        BigDecimal requirementPlanId = amstruckRequirementPlanMapper.selectOtherId();
-        amstruckRequirementPlan.setRequirementPlanId(requirementPlanId);
-        amstruckRequirementPlan.setPlanId(planId);
-        amstruckRequirementPlan.setRequirementId(requirementId);
-        amstruckRequirementPlan.setInsertTime(new Date());
-        amstruckRequirementPlan.setInsertUsername("admin");
-        amstruckRequirementPlan.setInsertUpdateRemark("无");
-        //在中间表中将需求与计划绑定
-        amstruckRequirementPlanMapper.insertSelective(amstruckRequirementPlan);
-        AmstruckInwardPlan amstruckInwardPlan=new AmstruckInwardPlan();
+        AmstruckInwardPlan amstruckInwardPlan = new AmstruckInwardPlan();
+        BigDecimal planId = amstruckInwardPlanMapper.selectOtherId();
         //设置主键
         amstruckInwardPlan.setPlanId(planId);
         //获取承运商id，车数
@@ -71,8 +60,7 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         BigDecimal planTruckNumber=new BigDecimal(mapValue.get("planTruckNumber").toString());
         amstruckInwardPlan.setCarrierId(carrierId);
         amstruckInwardPlan.setPlanTruckNumber(planTruckNumber);
-        DataChange dataChange=new DataChange();
-        amstruckInwardPlan.setPlanNumber(dataChange.generateEightDigitsNumber("YSJH",amstruckInwardPlanMapper.selectOtherId().intValue()));
+        amstruckInwardPlan.setPlanNumber(DataChange.generateEightDigitsNumber("YSJH",planId.intValue()));
         //设置计划状态为未下发
         amstruckInwardPlan.setPlanStatus(new BigDecimal(0));
         // 设置常规字段
@@ -80,7 +68,21 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         amstruckInwardPlan.setInsertUsername("admin");
         amstruckInwardPlan.setInsertUpdateRemark("无");
         amstruckInwardPlan.setDeleted(new BigDecimal(0));
-        return amstruckInwardPlanMapper.insertSelective(amstruckInwardPlan);
+        int i = amstruckInwardPlanMapper.insertSelective(amstruckInwardPlan);
+        //新增需求计划中间表
+        AmstruckRequirementPlan amstruckRequirementPlan = new AmstruckRequirementPlan();
+        //xu qiu ID
+        BigDecimal requirementId = new BigDecimal(mapValue.get("requirementId").toString());
+        BigDecimal requirementPlanId = amstruckRequirementPlanMapper.selectOtherId();
+        amstruckRequirementPlan.setRequirementPlanId(requirementPlanId);
+        amstruckRequirementPlan.setPlanId(planId);
+        amstruckRequirementPlan.setRequirementId(requirementId);
+        amstruckRequirementPlan.setInsertTime(new Date());
+        amstruckRequirementPlan.setInsertUsername("admin");
+        amstruckRequirementPlan.setInsertUpdateRemark("无");
+        //在中间表中将需求与计划绑定
+        i += amstruckRequirementPlanMapper.insertSelective(amstruckRequirementPlan);
+        return i;
     }
 
     @Override

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

@@ -72,7 +72,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckInwardRequirement.setPurchaseOrderId(new BigDecimal(purchaseOrderId));
         }
         amstruckInwardRequirement.setRequirementType(requirementType);
-        amstruckInwardRequirement.setCapacityTypeId(new BigDecimal(capacityTypeId));
+        amstruckInwardRequirement.setCapacityTypeId(new BigDecimal(1));
         amstruckInwardRequirement.setRequirementTruckTime(requirementTruckTime);
         amstruckInwardRequirement.setRequirementWorkType(new BigDecimal(requirementWorkType));
         amstruckInwardRequirement.setRequirementWorkContent(requirementWorkContent);
@@ -82,7 +82,6 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequirementOverlimit(requirementOverlimit);
         amstruckInwardRequirement.setRequirementShipperId(new BigDecimal(requirementShipperId));
         amstruckInwardRequirement.setRequirementUnloadUnitId(new BigDecimal(requirementUnloadUnitId));
-        amstruckInwardRequirement.setRequirementPlatformId(DataChange.dataToBigDecimal(mapValue.get("requirementPlatformId")));
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername("admin");

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-ams-api-dev

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-ams-api-dev

src/main/resources/bootstrap.yml

@@ -14,16 +14,16 @@ spring:
 
 openfeign:
 #   正式环境
-  ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.166:8089}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-
-#   测试环境
 #  ESFeign:
-#    url: ${ESFEIGN_URL:172.16.33.162:8011}
+#    url: ${ESFEIGN_URL:172.16.33.166:8089}
 #  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+
+#   测试环境
+  ESFeign:
+    url: ${ESFEIGN_URL:172.16.33.162:8011}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
 
 #eureka设置
 eureka:

src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardRequirementMapper.xml

@@ -1046,24 +1046,27 @@
     <!-- 查询批次和采购订单信息 -->
     <select id="getPurchaseIdByBatch" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT * FROM(
-        SELECT DISTINCT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
-        APO.PURCHASE_ORDER_ID AS "purchaseOrderId",
+        SELECT DISTINCT APO.PURCHASE_ORDER_NO       AS "purchaseOrderNo",
+        APO.PURCHASE_ORDER_ID       AS "purchaseOrderId",
         DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-        RM.MATERIAL_NAME AS "materialName",
-        DB.INSERT_TIME AS "insertTime",
-        RS.SHIPPER_NAME "shipperName"
-
-        FROM (SELECT * FROM AMS_PURCHASE_ORDER APO
+        RM.MATERIAL_NAME            AS "materialName",
+        DB.INSERT_TIME              AS "insertTime",
+        RS.SHIPPER_NAME             "shipperName",
+        RSR.SUPPLIER_NAME           "supplierName"
+        FROM (SELECT *
+        FROM AMS_PURCHASE_ORDER APO
         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
         ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
         WHERE AIR.PURCHASE_ORDER_ID IS NULL) APOIR
-        LEFT JOIN DIL_BATCH DB
+        JOIN DIL_BATCH DB
         ON DB.BATCH_ID = APOIR.BATCH_ID
-        LEFT JOIN AMS_PURCHASE_ORDER APO
+        JOIN AMS_PURCHASE_ORDER APO
         ON APO.BATCH_ID = DB.BATCH_ID
-        LEFT JOIN RMS_SHIPPER RS
-        ON  RS.SHIPPER_ID=APO.RECEIVE_UNIT_ID
-        LEFT JOIN RMS_MATERIAL RM
+        JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+        JOIN RMS_SUPPLIER RSR
+        ON RSR.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = DB.MATERIAL_ID)
         <where>
             <if test="purchaseOrderNo != null">
@@ -1090,6 +1093,12 @@
                     "shipperName" like '%${item}%'
                 </foreach>
             </if>
+             <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
         </where>
         <include refid="orderBy"></include>
     </select>
@@ -1110,11 +1119,41 @@
 
     <!-- 仓库模代框 -->
     <select id="getWareHouse" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT RW.WAREHOUSE_ID   AS "wareHouseId",
-               RW.WAREHOUSE_NAME AS "wareHouseName"
-        FROM RMS_WAREHOUSE RW
+        SELECT RW.WAREHOUSE_ID           AS "wareHouseId",
+       RW.WAREHOUSE_NAME         AS "wareHouseName",
+       rs.shipper_abbreviation   as "shipperName",
+       rs.shipper_company_branch as "companyBranchName",
+       rs.shipper_branch_factory as "branchFactory"
+       FROM RMS_WAREHOUSE RW
+       left join rms_shipper rs
+       on rs.shipper_id = rw.shipper_id
+        <where>
+            <if test="wareHouseName != null">
+                and
+                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
+                    "wareHouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="companyBranchName != null">
+                and
+                <foreach collection="companyBranchName" item="item" open="(" separator="or" close=")">
+                    "companyBranchName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="branchFactory != null">
+                and
+                <foreach collection="branchFactory" item="item" open="(" separator="or" close=")">
+                    "branchFactory" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
     </select>
-
     <select id="getMaterialId" parameterType="DECIMAL" resultType="DECIMAL">
         SELECT DB.MATERIAL_ID AS "materialId"
         FROM AMS_PURCHASE_ORDER APO