委外订单查询

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/SubcontractingOrderController.java

@@ -41,7 +41,7 @@ public class SubcontractingOrderController extends JeecgController<Subcontractin
      */
     @RequestMapping(value = "/getSubcontractingOrderByCode",method = RequestMethod.GET)
     @ResponseBody
-    public ResponseEntity<ResHttpStatus> getSubcontractingOrderByCode(String code, String key) {
+    public ResponseEntity<ResHttpStatus> getSubcontractingOrderByCode(String code,String MoDetailsID, String key) {
         ResHttpStatus res = new ResHttpStatus();
         res.setCode("0");
         res.setSuccess(false);
@@ -49,7 +49,11 @@ public class SubcontractingOrderController extends JeecgController<Subcontractin
             res.setMsg("订单号不能为空");
             return new ResponseEntity<>(res, HttpStatus.OK);
         }
-        List<SubcontractingOrder> order =subcontractingOrderService.selectOrderByCode(code);//"SYW313-森宏"
+       if(!StringUtils.isNotBlank(MoDetailsID)){
+            res.setMsg("子表主键不能为空");
+            return new ResponseEntity<>(res, HttpStatus.OK);
+        }
+        List<SubcontractingOrder> order =subcontractingOrderService.selectOrderByCode(code,MoDetailsID);//"SYW313-森宏"
         if(order.size() <= 0){
             res.setMsg("未查到有效数据");
             return new ResponseEntity<>(res, HttpStatus.OK);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/SubcontractingOrderMapper.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.openApi.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.jeecg.modules.openApi.entity.SubcontractingOrder;
 
 import java.util.List;
@@ -19,6 +20,6 @@ public interface SubcontractingOrderMapper extends BaseMapper<SubcontractingOrde
      * @param code
      * @return
      */
-    List<SubcontractingOrder> selectOrderByCode(String code);
+    List<SubcontractingOrder> selectOrderByCode(@Param("code")String code, @Param("MoDetailsID")String MoDetailsID);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/xml/SubcontractingOrderMapper.xml

@@ -21,6 +21,6 @@
                  left join Vendor d on a.cVenCode = d.cVenCode
                  left join VendorClass e on d.cVCCode = e.cVCCode
         where a.ccode = #{code}
-
+        and b.MoDetailsID = #{MoDetailsID}
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/SubcontractingOrderService.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface SubcontractingOrderService extends IService<SubcontractingOrder> {
 
-    List<SubcontractingOrder> selectOrderByCode(String code);
+    List<SubcontractingOrder> selectOrderByCode(String code,String MoDetailsID);
 
     String saveWarehousing(JSONArray json);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/SubcontractingOrderImpl.java

@@ -21,8 +21,8 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
     private SubcontractingOrderMapper subcontractingOrderMapper;
 
     @DS("multi-one")
-    public List<SubcontractingOrder> selectOrderByCode(String code){
-        return subcontractingOrderMapper.selectOrderByCode(code);
+    public List<SubcontractingOrder> selectOrderByCode(String code,String MoDetailsID){
+        return subcontractingOrderMapper.selectOrderByCode(code,MoDetailsID);
     }
 
     public String saveWarehousing(JSONArray json){
@@ -30,8 +30,17 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
         for(int i=0;i<json.size();i++){
             JSONObject jsonObject=json.getJSONObject(i);
             //获取账套
-            String cAccId=jsonObject.get("cAccId").toString();
-            String bredvouch=jsonObject.get("bredvouch").toString();//红蓝标识  采购入库
+            if(jsonObject.get("cAccId") != null){
+                String cAccId=jsonObject.get("cAccId").toString();
+            }else{
+                throw new RuntimeException("cAccId不能为空，或不合法");
+            }
+            if(jsonObject.get("cAccId") != null){
+                String bredvouch=jsonObject.get("bredvouch").toString();//红蓝标识  采购入库
+            }else{
+                throw new RuntimeException("bredvouch不能为空，或不合法");
+            }
+