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

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

@@ -891,6 +891,37 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         return success(result);
     }
 
+    @ApiModelProperty(value = "检查规格型号的格式对不对")
+    @PostMapping("/queryFormat")
+    public RESTfulResult queryFormat(@RequestBody List<Map<String,Object>> mapList){
+        for (Map<String, Object> map : mapList) {
+            String specification = (String) map.get("Specification");
+            Integer count = amsDispatchSaleOrderMapper.queryFormatCount(specification);
+            if (count.compareTo(0)==0){
+                return failed(count);
+            }
+        }
+        return success();
+    }
+
+    @ApiModelProperty(value = "查询物资ID并赋值")
+    @PostMapping(value = "/queryMaterial")
+    RESTfulResult queryMaterial(@RequestBody List<Map<String,Object>> mapList){
+        List<Map<String,Object>> mapList1=mapList;
+        for (Map<String, Object> map : mapList1) {
+            String specification = (String) map.get("Specification");
+            String materialName = (String) map.get("materialName");
+            BigDecimal materialid = amsDispatchSaleOrderMapper.queryMaterial(specification, materialName);
+            if (materialid ==null){
+                return failed();
+            }
+            map.remove("materialId");
+            map.put("materialId",materialid);
+        }
+        return success(mapList1);
+    }
+
+
     @ApiModelProperty(value = "查询出销售订单下的所有数据")
     @PostMapping("/getAllSaleMessages")
     public RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId) {

src/main/java/com/steerinfo/dil/mapper/AmsDispatchSaleOrderMapper.java

@@ -46,4 +46,10 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
 
     // 判断定向派单是否已存在
     BigDecimal isDispatchExist(BigDecimal saleOrderMaterialId);
+
+    //查询规格型号是否符合样式
+    Integer queryFormatCount(String Specification);
+
+    //查询出相应的ID
+    BigDecimal queryMaterial(String Specification,String materialName);
 }

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

@@ -682,4 +682,19 @@
         FROM AMS_DISPATCH_SALE_ORDER ADSO
         WHERE ADSO.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
+    
+    <select id="queryFormatCount" resultType="java.lang.Integer">
+        select count(RM.MATERIAL_ID) from RMS_MATERIAL RM
+        where RM.material_specification||RM.material_model||RM.material_length
+        =#{Specification}
+    </select>
+
+    <select id="queryMaterial" resultType="java.math.BigDecimal">
+        select RM.MATERIAL_ID
+        from RMS_MATERIAL RM
+        where
+        RM.material_specification||RM.material_model||RM.material_length
+        =#{Specification}
+        and RM.Material_Name=#{materialName}
+    </select>
 </mapper>