Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -92,6 +92,14 @@ public class AMScontroller {
         return amsFeign.purchaseRequirementAdd(map);
     }
 
+    @ApiOperation(value = "同步生产调拨订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/productionOrderSync")
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> productionOrderSync(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionOrderSync(map);
+    }
+
     @ApiOperation(value = "生产需求新增接口", notes = "生产需求新增接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")

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

@@ -428,6 +428,7 @@ public class RMScontroller extends BaseRESTfulController {
             //校验行
             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("NC主键")==null || item.get("NC主键").equals("")

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

@@ -41,6 +41,10 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementAdd")
     Map<String, Object> purchaseRequirementAdd(Map<String, Object> map);
 
+
+    @PostMapping(value = "api/v1/ams/amsorders/productionOrderSync")
+    Map<String, Object> productionOrderSync(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementAdd")
     Map<String, Object> productionRequirementAdd(Map<String, Object> map);
 

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

@@ -350,6 +350,9 @@
         'personnelName' "prop"
         from RMS_PERSONNEL
         where DELETED = 0
+        <if test="isNC!=null">
+            AND SOURCE_ID IS NOT NULL
+        </if>
         )
         <where>
             <if test="personnelPost!=null and personnelPost!=''">