xiugaineizhuan

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -1295,7 +1295,23 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @PostMapping("/getKucunList")
     public RESTfulResult getKucunList(@RequestBody(required = false)Map<String,Object>map,
                                       String startTime,
-                                      String endTime){
+                                      String endTime,
+                                      String remark,
+                                      String transferIndep,
+                                      String consigneeName,
+                                      String totheStation){
+        if(remark != null && !"null".equals(remark)&&!"".equals(remark)){
+            map.put("remark","%" + remark + "%");
+        }
+        if(transferIndep != null && !"null".equals(transferIndep) && !"".equals(transferIndep)){
+            map.put("transferIndep","%" + transferIndep + "%");
+        }
+        if(consigneeName != null && !"null".equals(consigneeName) && !"".equals(consigneeName)){
+            map.put("consigneeName","%" + consigneeName + "%");
+        }
+        if(totheStation != null && !"null".equals(totheStation) && !"".equals(totheStation)){
+            map.put("totheStation","%" + totheStation + "%");
+        }
         DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
         List<Map<String,Object>> mapList = amsSaleOrderService.getKucunList(map);
         return success(mapList);

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderMaterialController.java

@@ -250,12 +250,8 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
     @PostMapping("dispatchInwardTruckOrderBySale")
     public RESTfulResult dispatchInwardTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
         int result = amsSaleOrderMaterialService.dispatchInwardTruckOrderBySale(mapValue);
-        if (result == -1) {
-            return failed("该销售订单的净重已达到97%");
-        }
-        else {
-            return success(result);
-        }
+        return success(result);
+
     }
 
     @ApiOperation(value = "更新内转钢材收货客户")

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

@@ -517,7 +517,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
 
     @Override
     public int updateInwardConsignee(Map<String, Object> mapValue) {
-        if(mapValue.get("saleOrderId") != null && mapValue.get("sendStationId") != null ){
+        if(mapValue.get("saleMaterialId") != null && mapValue.get("sendStationId") != null ){
             amsSaleOrderMaterialMapper.updateSendStation(mapValue);
         }
         if(mapValue.get("saleOrderId") != null && mapValue.get("consigneeId") != null){

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

@@ -156,11 +156,11 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckRequirementMaterial.setInsertUsername("admin");
             amstruckRequirementMaterial.setInsertUpdateRemark(InsertUpdateRemark);
             result += amstruckRequirementMaterialMapper.insertSelective(amstruckRequirementMaterial);
-            if(mapValue.get("rangeId") != null){
-                //承运起止范围
-                requireMaterialMap.put("rangeId",mapValue.get("rangeId"));
-                amsContractTruckPriceService.insertLineNodePoint(requireMaterialMap);
-            }
+            //if(mapValue.get("rangeId") != null){
+            //    //承运起止范围
+            //    requireMaterialMap.put("rangeId",mapValue.get("rangeId"));
+            //    amsContractTruckPriceService.insertLineNodePoint(requireMaterialMap);
+            //}
         }
         return result;
     }

src/main/resources/application-dev.yml

@@ -15,13 +15,13 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:localhost:8006}
 
 
   #测试环境端口
 server:
-    port: 8079
+    port: 8015

src/main/resources/application-prod.yml

@@ -15,7 +15,7 @@ openfeign:
    ColumnDataFeign:
      url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
    TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
    ImFeign:
       url: ${IMFEIGN_URL:172.16.33.166:8055}
    JoinFeign:

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

@@ -4464,27 +4464,55 @@
                         RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')' "materialSpa",
                         ASM.MATERIAL_NUMBER                                    "materialNum",
                         ASM.MATERIAL_WEIGHT                                    "materialWeight",
-                        ASO.TRANSFER_IN_DEP                                    "transInDep",
-                        ASO.TRANSFER_OUT_DEP                                   "transOutDep",
-                        ASM.TRANSFER_IN_OF_WAREHOUSE                           "transInWarehouse",
+                        RISWINDEP.INWARD_WAREHOUSE_NAME                         "transInDep",
+                        RISWOUTDEP.INWARD_WAREHOUSE_NAME                         "transOutDep",
+                        RISWINOF.INWARD_WAREHOUSE_NAME                           "transInWarehouse",
                         RC.CONSIGNEE_COMPANY_NAME                              "receiveName",
                         ASO.SALE_ORDER_ID                                       "saleOrderId",
                         RAS1.ARRIVAL_ID                                         "sendStationId",
-                        RAS.ARRIVAL_ID                                          "toTheStationId"
+                        RAS.ARRIVAL_ID                                          "toTheStationId",
+                        ASM.IS_POUND_SALE                                       "isPoundSale",
+                        ASM.SALE_MATERIAL_ID                                    "saleMaterialId",
+                        TPAR.RESULT_ID                                          "approveId"
                       FROM AMS_SALE_ORDER ASO
                         LEFT JOIN AMS_SALE_MATERIAL ASM
                       ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
                         LEFT JOIN RMS_MATERIAL RM
                         ON RM.MATERIAL_ID = ASM.MATERIAL_ID
                         LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT  TPAR
-                        ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
+                        ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
                         LEFT JOIN RMSTRAIN_ARRIVAL_SEND   RAS
                         ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
                         LEFT JOIN RMSTRAIN_ARRIVAL_SEND   RAS1
                         ON RAS1.ARRIVAL_ID = TPAR.SEND_STATION_ID
                         LEFT JOIN RMS_CONSIGNEE           RC
                         ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                        LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINDEP
+                        ON RISWINDEP.INWARD_WAREHOUSE_CODE = ASO.TRANSFER_IN_DEP
+                        LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWOUTDEP
+                        ON RISWOUTDEP.INWARD_WAREHOUSE_CODE = ASO.TRANSFER_OUT_DEP
+                        LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF
+                        ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
                       WHERE ASO.SALE_TYPE = 4
+                      <if test="oneDate != null">
+                        and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
+                      </if>
+                      <if test="startDate != null">
+                        and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASO.INSERT_TIME
+                        and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASO.INSERT_TIME
+                      </if>
+                      <if test="remark != null">
+                        and ASO.SALE_REMARK||RM.MATERIAL_NAME LIKE #{remark}
+                      </if>
+                      <if test="totheStation != null">
+                        and RAS.ARRIVAL_NAME LIKE #{totheStation}
+                      </if>
+                      <if test="consigneeName != null">
+                        and RC.CONSIGNEE_COMPANY_NAME like #{consigneeName}
+                      </if>
+                      <if test="transferIndep != null">
+                        and RISWINDEP.INWARD_WAREHOUSE_NAME = #{transferIndep}
+                      </if>
        )
     </select>
 </mapper>

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

@@ -833,7 +833,7 @@
     update
       TMSTRAIN_PLEASE_APPROVE_RESULT
     set SEND_STATION_ID=#{sendStationId}
-    WHERE RAIL_PLAN_ID=#{saleOrderId}
+    WHERE RAIL_PLAN_ID=#{saleMaterialId}
   </update>
   <update id="updateInwardConsignee">
     update