云南代储点bug修改

src/main/java/com/chinaitop/depot/agent/bgz/controller/BusinessAgentBgmxzController.java

@@ -12,6 +12,8 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.utils.HTTPUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,8 +32,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 
 @RestController
 @RequestMapping(value = "/agent_bgmxz")
@@ -214,7 +214,7 @@ public class BusinessAgentBgmxzController {
 		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query"),
 		@ApiImplicitParam(name="stateType", value="路径状态", paramType="query")
 	})
-	public String selectAgentHouseWareList(Integer orgId,String stateType) throws Exception {
+	public Map<String, Object> selectAgentHouseWareList(Integer orgId,String stateType) throws Exception {
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
 
@@ -232,8 +232,10 @@ public class BusinessAgentBgmxzController {
 		Map<String, Object> dataMap = new HashMap<String, Object>();
 		dataMap.put("datas",str);
 		String strResult = HTTPUtils.doPost(url,dataMap);
+		JSONArray json = JSONArray.parseArray(strResult);
+		paramMap.put("strResult",json);
 
-		return strResult;
+		return paramMap;
 	}
 	
 	@RequestMapping(value="/addCrkFcbgzData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
@@ -248,7 +250,7 @@ public class BusinessAgentBgmxzController {
 		Map<String, Object> map = new HashMap<String, Object>();
 
 		try {
-			JSONArray json = JSONArray.fromObject(fcbgzData);
+			JSONArray json = JSONArray.parseArray(fcbgzData);
 			if (json.size() > 0) {
 				BusinessAgentBgmxz bgmxz = null;
 				for (int i = 0; i < json.size(); i++) {

src/main/java/com/chinaitop/depot/agent/crk/controller/AgentHcController.java

@@ -11,6 +11,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.utils.HTTPUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,8 +35,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 
 @RestController
 @RequestMapping(value = "/agentHc")
@@ -225,7 +225,7 @@ public class AgentHcController {
 	@ApiImplicitParams({
 		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query")
 	})
-	public String selectAgentHouseWareList(Integer orgId) throws Exception {
+	public Map<String, Object> selectAgentHouseWareList(Integer orgId) throws Exception {
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
 
@@ -237,8 +237,10 @@ public class AgentHcController {
         Map<String, Object> dataMap = new HashMap<String, Object>();
         dataMap.put("datas",str);
         String strResult = HTTPUtils.doPost(url,dataMap);
+        JSONArray json = JSONArray.parseArray(strResult);
+        paramMap.put("strResult",json);
 
-		return strResult;
+		return paramMap;
 	}
     
     @RequestMapping(value="/editHcCrkRecordData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
@@ -253,7 +255,7 @@ public class AgentHcController {
 		Map<String, Object> map = new HashMap<String, Object>();
 
 		try {
-			JSONArray json = JSONArray.fromObject(hcCrkRecordData);
+			JSONArray json = JSONArray.parseArray(hcCrkRecordData);
 			if (json.size() > 0) {
 				BusinessAgentHc agentHc = null;
 				for (int i = 0; i < json.size(); i++) {
@@ -279,7 +281,7 @@ public class AgentHcController {
 					agentHc.setGrainNumber(job.get("count")+"");
 					agentHc.setStorehouseId(houseId);
 					agentHc.setWarehouseId(wareId);
-					Date crk_time = ParameterUtil.string2date(job.get("rq")+"");
+					Date crk_time = ParameterUtil.string2datetime(job.get("rq")+"");
 					agentHc.setCrkTime(crk_time);
 					agentHc.setCreateTime(new Date());
 					agentHc.setSjly(1);

src/main/java/com/chinaitop/depot/agent/crk/controller/AgentQcController.java

@@ -11,6 +11,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.utils.HTTPUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,8 +35,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 
 @RestController
 @RequestMapping(value = "/agentQc")
@@ -225,7 +225,7 @@ public class AgentQcController {
 	@ApiImplicitParams({
 		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query")
 	})
-	public String selectAgentHouseWareList(Integer orgId) throws Exception {
+	public Map<String, Object> selectAgentHouseWareList(Integer orgId) throws Exception {
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
 
@@ -237,8 +237,10 @@ public class AgentQcController {
         Map<String, Object> dataMap = new HashMap<String, Object>();
         dataMap.put("datas",str);
         String strResult = HTTPUtils.doPost(url,dataMap);
+        JSONArray json = JSONArray.parseArray(strResult);
+        paramMap.put("strResult",json);
 
-		return strResult;
+		return paramMap;
 	}
 
     @RequestMapping(value="/editQcCrkRecordData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
@@ -251,9 +253,8 @@ public class AgentQcController {
 	public Map<String, Object> editQcCrkRecordData(String qcCrkRecordData, Integer orgId, String realName) {
 
 		Map<String, Object> map = new HashMap<String, Object>();
-
 		try {
-			JSONArray json = JSONArray.fromObject(qcCrkRecordData);
+			JSONArray json = JSONArray.parseArray(qcCrkRecordData);
 			if (json.size() > 0) {
 				BusinessAgentQc agentQc = null;
 				for (int i = 0; i < json.size(); i++) {
@@ -284,7 +285,7 @@ public class AgentQcController {
 					agentQc.setGrainNumber(job.get("count")+"");
 					agentQc.setStorehouseId(houseId);
 					agentQc.setWarehouseId(wareId);
-					Date crk_time = ParameterUtil.string2date(job.get("rq")+"");
+					Date crk_time = ParameterUtil.string2datetime(job.get("rq")+"");
 					agentQc.setCrkTime(crk_time);
 					agentQc.setCreateTime(new Date());
 					agentQc.setSjly(1);

src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentQcMapper.xml

@@ -466,7 +466,7 @@
     	c.qccrk_tbsj modifydate
     FROM business_agent_depot a
 	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
-	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id 
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id AND c.del_flag=1
 	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
 	<if test="orgId != null">
 	and c.org_id=#{orgId,jdbcType=INTEGER}

src/main/java/com/chinaitop/depot/agent/number/controller/AgentNumberController.java

@@ -9,6 +9,9 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -32,8 +35,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 
 @RestController
 @RequestMapping(value = "/agentNumber")
@@ -222,7 +223,7 @@ public class AgentNumberController {
 		Map<String, Object> map = new HashMap<String, Object>();
 
 		try {
-			JSONArray json = JSONArray.fromObject(kcswData);
+			JSONArray json = JSONArray.parseArray(kcswData);
 			if (json.size() > 0) {
 				BusinessAgentNumber agentNumber = null;
 				for (int i = 0; i < json.size(); i++) {