合格入库单

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.openApi.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -12,11 +13,11 @@ import org.jeecg.modules.openApi.service.SubcontractingOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.net.HttpURLConnection;
+import java.util.Enumeration;
 import java.util.List;
 
 /**
@@ -30,7 +31,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/openApi/subcontractingOrder")
 public class SubcontractingOrderController extends JeecgController<SubcontractingOrder, SubcontractingOrderService> {
-
+    @Autowired
+    private HttpServletRequest request;
     @Autowired
     private SubcontractingOrderService subcontractingOrderService;
 
@@ -41,20 +43,58 @@ public class SubcontractingOrderController extends JeecgController<Subcontractin
     @ResponseBody
     public ResponseEntity<ResHttpStatus> getSubcontractingOrderByCode(String code, String key) {
         ResHttpStatus res = new ResHttpStatus();
+        res.setCode("0");
+        res.setSuccess(false);
         if(!StringUtils.isNotBlank(code)){
-            res.setCode("0");
             res.setMsg("订单号不能为空");
-            res.setSuccess(false);
+            return new ResponseEntity<>(res, HttpStatus.OK);
         }
-
         List<SubcontractingOrder> order =subcontractingOrderService.selectOrderByCode(code);//"SYW313-森宏"
+        if(order.size() <= 0){
+            res.setMsg("未查到有效数据");
+            return new ResponseEntity<>(res, HttpStatus.OK);
+        }
         res.setCode("200");
         res.setMsg("成功");
         res.setSuccess(true);
         res.setData(order);
 
-        return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+        return new ResponseEntity<>(res, HttpStatus.OK);
+    }
+
+   /**
+     * 合格入库单-验布机
+     */
+    @RequestMapping(value = "/saveWarehousing",method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseEntity<ResHttpStatus> saveWarehousing(@RequestBody JSONArray json) {
+        ResHttpStatus res = new ResHttpStatus();
+        res.setCode("0");
+        res.setSuccess(false);
+
+        String key = request.getHeader("key");
+        if(!StringUtils.isNotBlank(key)){
+            res.setMsg("key不能为空");
+            return new ResponseEntity<>(res, HttpStatus.OK);
+        }
+
+        if(json.size() < 1){
+            res.setMsg("正文数据不能为空");
+            return new ResponseEntity<>(res, HttpStatus.OK);
+        }
+
+        try {
+            subcontractingOrderService.saveWarehousing(json);
+            res.setCode("200");
+            res.setSuccess(true);
+
+        }catch (Exception e){
+            res.setMsg(e.getMessage());
+        }
+
+        return new ResponseEntity<>(res, HttpStatus.OK);
     }
 
 
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/entity/ResHttpStatus.java

@@ -15,6 +15,8 @@ public class ResHttpStatus {
     // 返回状态消息
     private boolean success;
 
+    private long timestamp = System.currentTimeMillis();
+
     private Object data;
 
     public String getCode() {
@@ -48,4 +50,16 @@ public class ResHttpStatus {
     public void setSuccess(boolean success) {
         this.success = success;
     }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/entity/SubcontractingOrder.java

@@ -5,6 +5,7 @@ import lombok.Data;
 @Data
 public class SubcontractingOrder {
 
+    private String moId; //编号
     private String cvcName; //染厂
     private String cCode; //委外订单号
     private String cInvCode; //存货编码

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

@@ -4,7 +4,8 @@
 
     <select id="selectOrderByCode" resultType="org.jeecg.modules.openApi.entity.SubcontractingOrder">
 
-        select e.cvcName ,-- 染厂
+        select a.moId ,-- 染厂
+               e.cvcName ,-- 染厂
                a.cCode ,-- 委外订单号
                b.cInvCode , -- 存货编码
                c.cInvName , -- 存货名称

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.openApi.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.openApi.entity.SubcontractingOrder;
 
@@ -8,4 +9,6 @@ import java.util.List;
 public interface SubcontractingOrderService extends IService<SubcontractingOrder> {
 
     List<SubcontractingOrder> selectOrderByCode(String code);
+
+    String saveWarehousing(JSONArray json);
 }

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.openApi.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.openApi.entity.SubcontractingOrder;
@@ -22,4 +24,20 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
     public List<SubcontractingOrder> selectOrderByCode(String code){
         return subcontractingOrderMapper.selectOrderByCode(code);
     }
+
+    public String saveWarehousing(JSONArray json){
+
+        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();//红蓝标识  采购入库
+
+
+
+
+        }
+
+        return "true";
+    }
 }