修改

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

@@ -330,7 +330,7 @@ public class AMScontroller  extends BaseRESTfulController {
     @PostMapping("/")
     public Map<String, Object> insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         if (map.containsKey("priceDate")){
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
             map.put("priceDate", priceDate);
         }
@@ -854,4 +854,10 @@ public class AMScontroller  extends BaseRESTfulController {
     RESTfulResult selectBalanceRemark(@RequestBody Map<String,Object> map) {
         return amsFeign.selectBalanceRemark(map);
     }
+
+    @ApiOperation("销售物流单停用或启用")
+    @PostMapping("/deactivateOrEnable")
+    RESTfulResult deactivateOrEnable(@RequestBody Map<String,Object> map) {
+        return amsFeign.deactivateOrEnable(map);
+    }
 }

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

@@ -316,6 +316,86 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getMaterialYieldList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "获取物资产量列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getRmsBaseProductionCostList")
+    public Map<String, Object> getRmsBaseProductionCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize
+    ) {
+        return rmsFeign.getRmsBaseProductionCostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/insertRmsBaseProductionCost")
+    public Map<String, Object> insertRmsBaseProductionCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.insertRmsBaseProductionCost(mapValue);
+    }
+
+    @PostMapping("/updateRmsBaseProductionCost")
+    public Map<String, Object> updateRmsBaseProductionCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateRmsBaseProductionCost(mapValue);
+    }
+
+    @PostMapping("/deleteRmsBaseProductionCost")
+    public Map<String, Object> deleteRmsBaseProductionCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.deleteRmsBaseProductionCost(mapValue);
+    }
+
+    @PostMapping("/getRmsBasePurchaseCostList")
+    public Map<String, Object> getRmsBasePurchaseCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                            Integer apiId,
+                                                            Integer pageNum,
+                                                            Integer pageSize
+    ) {
+        return rmsFeign.getRmsBasePurchaseCostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/insertRmsBasePurchaseCost")
+    public Map<String, Object> insertRmsBasePurchaseCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.insertRmsBasePurchaseCost(mapValue);
+    }
+
+    @PostMapping("/updateRmsBasePurchaseCost")
+    public Map<String, Object> updateRmsBasePurchaseCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateRmsBasePurchaseCost(mapValue);
+    }
+
+    @PostMapping("/deleteRmsBasePurchaseCost")
+    public Map<String, Object> deleteRmsBasePurchaseCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.deleteRmsBasePurchaseCost(mapValue);
+    }
+
+    @PostMapping("/getRmsBaseSaleCostList")
+    public Map<String, Object> getRmsBaseSaleCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize
+    ) {
+        return rmsFeign.getRmsBaseSaleCostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/insertRmsBaseSaleCost")
+    public Map<String, Object> insertRmsBaseSaleCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.insertRmsBaseSaleCost(mapValue);
+    }
+
+    @PostMapping("/updateRmsBaseSaleCost")
+    public Map<String, Object> updateRmsBaseSaleCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateRmsBaseSaleCost(mapValue);
+    }
+
+    @PostMapping("/deleteRmsBaseSaleCost")
+    public Map<String, Object> deleteRmsBaseSaleCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.deleteRmsBaseSaleCost(mapValue);
+    }
+
     @PostMapping("/insertMaterialYield")
     public Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String, Object> mapValue) {
         return rmsFeign.insertMaterialYield(mapValue);
@@ -546,6 +626,37 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.importPersonnel(map);
     }
 
+    @ApiOperation("导入人员信息")
+    @PostMapping("/importPersonnelSyncSSO")
+    public RESTfulResult importPersonnelSyncSSO(@RequestBody MultipartFile file,
+                                          String userId,
+                                          String userName) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        for (Map<String, Object> item : list) {
+            //校验行
+            if(
+                    item.get("姓名")==null || item.get("姓名").equals("")
+                            || item.get("身份证号")==null || item.get("身份证号").equals("")
+                            || item.get("手机")==null || item.get("手机").equals("")
+                            || item.get("单位")==null || item.get("单位").equals("")
+                            || item.get("岗位名称")==null || item.get("岗位名称").equals("")
+            ){
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
+            }
+            item.put("companyId",item.get("单位"));
+            item.put("personnelPost",item.get("岗位名称"));
+            item.put("personnelName",item.get("姓名"));
+            item.put("personnelPhone",item.get("手机"));
+            item.put("identityCard",item.get("身份证号"));
+        }
+        map.put("userId",userId);
+        map.put("userName",userName);
+        return rmsFeign.importPersonnelSyncSSO(map);
+    }
+
 
     //================公司
     @ApiOperation(value = "展示公司信息")

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

@@ -87,6 +87,14 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.updateAmsSalaryContrac(map);
     }
 
+    @ApiOperation(value = "修改车辆实绩")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/tmscomprehensiveresults/batchUpdate")
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
+    public Map<String, Object> tmscomprehensiveresultsBatchUpdate(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.tmscomprehensiveresultsBatchUpdate((List)map.get("list"));
+    }
+
     @ApiOperation(value = "派发运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/dispatchOrder")
@@ -757,4 +765,11 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation("多拼派车")
     @PostMapping("/saleDispatchDuoPin")
     RESTfulResult saleDispatchDuoPin(@RequestBody Map<String,Object> map) {return tmsFeign.saleDispatchDuoPin(map);}
+
+
+    @ApiOperation("同步生产实绩")
+    @PostMapping("/syncProductionResult")
+    RESTfulResult syncProductionResult(@RequestBody Map<String,Object> map) {
+        return tmsFeign.syncProductionResult(map);
+    }
 }

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -317,4 +317,7 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectBalanceRemark")
     RESTfulResult selectBalanceRemark(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/deactivateOrEnable")
+    RESTfulResult deactivateOrEnable(@RequestBody Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -127,6 +127,52 @@ public interface RmsFeign {
                                         @RequestParam("apiId") Integer apiId,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize);
+    @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/getRmsBaseProductionCostList")
+    Map<String, Object> getRmsBaseProductionCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
+    //新增生产成本数据
+    @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/insertRmsBaseProductionCost")
+    Map<String, Object> insertRmsBaseProductionCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/updateRmsBaseProductionCost")
+    Map<String, Object> updateRmsBaseProductionCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/deleteRmsBaseProductionCost")
+    Map<String, Object> deleteRmsBaseProductionCost(@RequestBody(required = false) Map<String,Object> model);
+
+
+    @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/getRmsBasePurchaseCostList")
+    Map<String, Object> getRmsBasePurchaseCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize);
+    //新增生产成本数据
+    @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/insertRmsBasePurchaseCost")
+    Map<String, Object> insertRmsBasePurchaseCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/updateRmsBasePurchaseCost")
+    Map<String, Object> updateRmsBasePurchaseCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/deleteRmsBasePurchaseCost")
+    Map<String, Object> deleteRmsBasePurchaseCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasesalecosts/getRmsBaseSaleCostList")
+    Map<String, Object> getRmsBaseSaleCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize);
+    //新增生产成本数据
+    @PostMapping(value = "api/v1/rms/rmsbasesalecosts/insertRmsBaseSaleCost")
+    Map<String, Object> insertRmsBaseSaleCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasesalecosts/updateRmsBaseSaleCost")
+    Map<String, Object> updateRmsBaseSaleCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasesalecosts/deleteRmsBaseSaleCost")
+    Map<String, Object> deleteRmsBaseSaleCost(@RequestBody(required = false) Map<String,Object> model);
+
     //新增物料产量
     @PostMapping(value = "api/v1/rms/rmsmaterialyields/insertMaterialYield")
     Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String,Object> model);
@@ -848,6 +894,9 @@ public interface RmsFeign {
     Map<String, Object> relevance(@RequestBody(required = false) Map<String, Object> mapValue);
     @PostMapping(value = "api/v1/rms/rmscompanybmts/cancelRelevance")
     Map<String, Object> cancelRelevance(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/rms/rmspersonnel/importPersonnelSyncSSO")
+    RESTfulResult importPersonnelSyncSSO(@RequestBody(required = false)Map<String, Object> map);
 }
 
 

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -35,6 +35,8 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/tmscomprehensiveresults/tmscomprehensiveresultsupdate")
     Map<String, Object> updateAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/batchUpdate")
+    Map<String, Object> tmscomprehensiveresultsBatchUpdate(@RequestBody(required = false) List<Map<String, Object>> map);
 
     @PutMapping("api/v1/tms/tmscomprehensiveresults/logicdelete")
     Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
@@ -273,6 +275,9 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/omstransorders/saleDispatchDuoPin")
     RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/syncProductionResult")
+    RESTfulResult syncProductionResult(@RequestBody Map<String, Object> map);
 }
 
 

src/main/resources/application-prod.yml

@@ -26,11 +26,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${AMSFEIGN_URL:localhost:8079}
+#    url: ${AMSFEIGN_URL:172.16.90.202:8000}
+    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${TMSFEIGN_URL:localhost:8086}
+#    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:

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

@@ -829,7 +829,17 @@
         rc.LINE_ID  "lineId",
         'operationRangeName' "prop"
         from RMS_TRANS_RANGE RC
-        where DELETED = 0
+        left join rms_operation_point rop_s
+        on rop_s.operation_point_id = RC.start_point_id
+        left join rms_operation_point rop_e
+        on rop_e.operation_point_id = RC.end_point_id
+        <where>
+            and RC.DELETED = 0
+            <if test="isNc!=null and isNc!=''">
+                and rop_s.alternate_fields1 = 'NC'
+                and rop_e.alternate_fields1 = 'NC'
+            </if>
+        </where>
         )
         <where>
             <if test="index!=null and index!=''">
@@ -1055,6 +1065,8 @@
         RC.MATERIAL_NAME "text",
         'materialName' "prop"
         from RMS_MATERIAL RC
+        left join rms_material_map t
+        on t.prod_code_l = RC.MATERIAL_CODE
         <where>
             DELETED = 0
             <if test="index!=null and index!=''">
@@ -1070,6 +1082,10 @@
             <if test="materialId!=null and materialId!=''">
                 AND RC.MATERIAL_ID = #{materialId}
             </if>
+            <if test="prodCode!=null and prodCode!=''">
+                AND ( REGEXP_LIKE(t.prod_code, #{prodCode})
+                OR REGEXP_LIKE(RC.MATERIAL_CODE, #{prodCode}) )
+            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
         )
@@ -1335,6 +1351,9 @@
             <if test="prodCode != null and prodCode != ''">
                 and REGEXP_LIKE(t.prod_code, #{prodCode})
             </if>
+            <if test="prodName != null and prodName != ''">
+                and REGEXP_LIKE(b.material_name, #{prodName})
+            </if>
         </where>
         union all
         select '' as "prodCodePk",
@@ -1366,6 +1385,9 @@
             <if test="prodCode != null and prodCode != ''">
                 and REGEXP_LIKE(b.material_code, #{prodCode})
             </if>
+            <if test="prodName != null and prodName != ''">
+                and REGEXP_LIKE(b.material_name, #{prodName})
+            </if>
             <if test="materialId != null and materialId != ''">
                 and REGEXP_LIKE(b.material_id, #{materialId})
             </if>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file,RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@@ -37,6 +37,8 @@ log4j.appender.errorfile.Threshold = ERROR
 log4j.appender.errorfile.layout=org.apache.log4j.PatternLayout
 #log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
 log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+log4j.appender.errorfile.MaxFileSize=100MB
+log4j.appender.errorfile.MaxBackupIndex=3
 
 ### 运行日志 ###
 log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
@@ -46,6 +48,8 @@ log4j.appender.RUNNING.Threshold = INFO
 log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+log4j.appender.RUNNING.MaxFileSize=100MB
+log4j.appender.RUNNING.MaxBackupIndex=3
 
 ### 指定类###
 log4j.logger.com.steer.rbac.sysdebuglog.service.DebugLogRecord = DEBUG,DEB