Pārlūkot izejas kodu

云南bug修改

lvzhikai 5 gadi atpakaļ
vecāks
revīzija
2feb28759f

+ 21 - 3
src/main/java/com/chinaitop/depot/agent/bgz/controller/BusinessAgentBgmxzController.java

@@ -1,5 +1,7 @@
1 1
 package com.chinaitop.depot.agent.bgz.controller;
2 2
 
3
+import java.io.UnsupportedEncodingException;
4
+import java.lang.reflect.Parameter;
3 5
 import java.math.BigDecimal;
4 6
 import java.util.Date;
5 7
 import java.util.HashMap;
@@ -8,6 +10,9 @@ import java.util.Map;
8 10
 
9 11
 import javax.annotation.Resource;
10 12
 
13
+import com.alibaba.fastjson.JSON;
14
+import com.chinaitop.utils.HTTPUtils;
15
+import com.sun.deploy.net.URLEncoder;
11 16
 import org.springframework.http.MediaType;
12 17
 import org.springframework.web.bind.annotation.RequestMapping;
13 18
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -206,16 +211,29 @@ public class BusinessAgentBgmxzController {
206 211
 	@RequestMapping(value="/selectAgentHouseWareList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
207 212
 	@ApiOperation(value="查询代储库正常使用的货位数据信息", notes = "查询代储库正常使用的货位数据信息")
208 213
 	@ApiImplicitParams({
209
-		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query")
214
+		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query"),
215
+		@ApiImplicitParam(name="stateType", value="路径状态", paramType="query")
210 216
 	})
211
-	public List<Map<String, Object>> selectAgentHouseWareList(Integer orgId) {
217
+	public String selectAgentHouseWareList(Integer orgId,String stateType) throws Exception {
212 218
 
213 219
 		Map<String, Object> paramMap = new HashMap<String, Object>();
214 220
 
215 221
 		paramMap.put("orgId", orgId);
216 222
 		List<Map<String, Object>> list = bgmxzService.selectAgentHouseWareList(paramMap);
217 223
 
218
-		return list;
224
+		String str = JSON.toJSONString(list);
225
+		String dataList = URLEncoder.encode(str, "UTF-8");
226
+		String url = "";
227
+		if(ParameterUtil.isequal(stateType,"kcsw")){
228
+			url = "http://localhost:9026/agile/kcsw/queryKcswData?datas="+dataList;//库存实物
229
+		}else if(ParameterUtil.isequal(stateType,"fcbgz")){
230
+			url = "http://localhost:9026/agile/fcbgzController/queryFcbgzData?datas="+dataList;//分仓保管账
231
+		}
232
+
233
+
234
+		String strResult = HTTPUtils.doGet(url);
235
+
236
+		return strResult;
219 237
 	}
220 238
 	
221 239
 	@RequestMapping(value="/addCrkFcbgzData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)

+ 2 - 2
src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgmxzMapper.xml

@@ -520,8 +520,8 @@
520 520
 
521 521
   <!-- 查询代储库仓房货位信息 -->
522 522
   <select id="selectAgentHouseWareList" parameterType="java.util.Map" resultType="java.util.Map">
523
-    SELECT 
524
-    	a.depot_id+"" unitid,
523
+    SELECT
524
+        CAST(a.depot_id AS CHAR) unitid,
525 525
     	c.warehouse_id hwh,
526 526
     	c.bgmxz_tbsj modifydate
527 527
     FROM business_agent_depot a

+ 11 - 3
src/main/java/com/chinaitop/depot/agent/crk/controller/AgentHcController.java

@@ -9,6 +9,9 @@ import java.util.Map;
9 9
 import javax.annotation.Resource;
10 10
 import javax.servlet.http.HttpServletRequest;
11 11
 
12
+import com.alibaba.fastjson.JSON;
13
+import com.chinaitop.utils.HTTPUtils;
14
+import com.sun.deploy.net.URLEncoder;
12 15
 import org.springframework.http.MediaType;
13 16
 import org.springframework.web.bind.annotation.RequestMapping;
14 17
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -222,14 +225,19 @@ public class AgentHcController {
222 225
 	@ApiImplicitParams({
223 226
 		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query")
224 227
 	})
225
-	public List<Map<String, Object>> selectAgentHouseWareList(Integer orgId) {
228
+	public String selectAgentHouseWareList(Integer orgId) throws Exception {
226 229
 
227 230
 		Map<String, Object> paramMap = new HashMap<String, Object>();
228 231
 
229 232
 		paramMap.put("orgId", orgId);
230 233
 		List<Map<String, Object>> list = agentHcService.selectAgentHouseWareList(paramMap);
231 234
 
232
-		return list;
235
+        String str = JSON.toJSONString(list);
236
+        String dataList = URLEncoder.encode(str, "UTF-8");
237
+        String url = "http://localhost:9026/crkRecord/queryHcCrkRecordData?datas="+dataList;
238
+        String strResult = HTTPUtils.doGet(url);
239
+
240
+		return strResult;
233 241
 	}
234 242
     
235 243
     @RequestMapping(value="/editHcCrkRecordData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
@@ -290,4 +298,4 @@ public class AgentHcController {
290 298
 
291 299
 		return map;
292 300
 	}
293
-}
301
+}

+ 10 - 2
src/main/java/com/chinaitop/depot/agent/crk/controller/AgentQcController.java

@@ -9,6 +9,9 @@ import java.util.Map;
9 9
 import javax.annotation.Resource;
10 10
 import javax.servlet.http.HttpServletRequest;
11 11
 
12
+import com.alibaba.fastjson.JSON;
13
+import com.chinaitop.utils.HTTPUtils;
14
+import com.sun.deploy.net.URLEncoder;
12 15
 import org.springframework.http.MediaType;
13 16
 import org.springframework.web.bind.annotation.RequestMapping;
14 17
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -222,14 +225,19 @@ public class AgentQcController {
222 225
 	@ApiImplicitParams({
223 226
 		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query")
224 227
 	})
225
-	public List<Map<String, Object>> selectAgentHouseWareList(Integer orgId) {
228
+	public String selectAgentHouseWareList(Integer orgId) throws Exception {
226 229
 
227 230
 		Map<String, Object> paramMap = new HashMap<String, Object>();
228 231
 
229 232
 		paramMap.put("orgId", orgId);
230 233
 		List<Map<String, Object>> list = agentQcService.selectAgentHouseWareList(paramMap);
231 234
 
232
-		return list;
235
+        String str = JSON.toJSONString(list);
236
+        String dataList = URLEncoder.encode(str, "UTF-8");
237
+        String url = "http://localhost:9026/crkRecord/queryQcCrkRecordData?datas="+dataList;
238
+        String strResult = HTTPUtils.doGet(url);
239
+
240
+		return strResult;
233 241
 	}
234 242
 
235 243
     @RequestMapping(value="/editQcCrkRecordData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)

+ 8 - 8
src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentHcMapper.xml

@@ -388,11 +388,11 @@
388 388
     a.*
389 389
     FROM
390 390
     (SELECT
391
-          hc.id,hc.agent_id agentId,hc.agent_depot_id agentDepotId,hc.notice,hc.inbound,hc.train_no trainNo,
391
+          hc.id,hc.agent_id agentId,hc.agent_depot_id agentDepotId,depot.depot_id agentOrgId,hc.notice,hc.inbound,hc.train_no trainNo,
392 392
           hc.business_type businessType,hc.lspz,hc.grain_number grainNumber,hc.storehouse_id storehouseId,
393 393
           hc.warehouse_id warehouseId,hc.crk_time crkTime,hc.org_id orgId,hc.create_time createTime,
394 394
           ware.warehouse_name warehouseName,store.storehouse_name storehouseName,agent.agent_name agentName,
395
-          depot.agent_depot_name agentDepotName,hc.updatetime
395
+          depot.agent_depot_name agentDepotName,hc.updatetime,hc.sjly sjly
396 396
       FROM
397 397
           business_agent_hc hc
398 398
           LEFT JOIN business_agent agent ON agent.id = hc.agent_id AND agent.org_id = #{orgId,jdbcType=INTEGER}
@@ -420,11 +420,11 @@
420 420
           </if>
421 421
     UNION ALL
422 422
     SELECT
423
-        hc.id,hc.agent_id agentId,hc.agent_depot_id agentDepotId,hc.notice,hc.inbound,hc.train_no trainNo,
423
+        hc.id,hc.agent_id agentId,hc.agent_depot_id agentDepotId,depot.depot_id agentOrgId,hc.notice,hc.inbound,hc.train_no trainNo,
424 424
         hc.business_type businessType,hc.lspz,hc.grain_number grainNumber,hc.storehouse_id storehouseId,
425 425
         hc.warehouse_id warehouseId,hc.crk_time crkTime,hc.org_id orgId,hc.create_time createTime,
426 426
         ware.warehouse_name warehouseName,store.storehouse_name storehouseName,agent.agent_name agentName,
427
-        depot.agent_depot_name agentDepotName,hc.updatetime
427
+        depot.agent_depot_name agentDepotName,hc.updatetime,hc.sjly sjly
428 428
     FROM
429 429
     business_agent_hc hc
430 430
         INNER JOIN business_agent_storehouse aStore ON aStore.storehouse_id = hc.storehouse_id
@@ -459,14 +459,14 @@
459 459
   
460 460
   <!-- 查询代储库仓房货位信息 -->
461 461
   <select id="selectAgentHouseWareList" parameterType="java.util.Map" resultType="java.util.Map">
462
-    SELECT 
463
-    	a.depot_id+"" unitid,
462
+    SELECT
463
+        CAST(a.depot_id AS CHAR) unitid,
464 464
     	c.warehouse_id hwh,
465 465
     	c.hccrk_tbsj modifydate
466 466
     FROM business_agent_depot a
467 467
 	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
468
-	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id 
469
-	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
468
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id AND c.del_flag=1
469
+    WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL
470 470
 	<if test="orgId != null">
471 471
 	and c.org_id=#{orgId,jdbcType=INTEGER}
472 472
 	</if>

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

@@ -389,7 +389,7 @@
389 389
     a.*
390 390
     FROM
391 391
     (SELECT
392
-        qc.id,qc.agent_id agentId,qc.agent_depot_id agentDepotId,qc.notice,qc.business_number businessNumber,qc.car_brand carBrand,
392
+        qc.id,qc.agent_id agentId,qc.agent_depot_id agentDepotId,depot.depot_id agentOrgId,qc.notice,qc.business_number businessNumber,qc.car_brand carBrand,
393 393
         qc.business_type businessType,qc.lspz,qc.grain_number grainNumber,qc.storehouse_id storehouseId,
394 394
         qc.warehouse_id warehouseId,qc.crk_time crkTime,qc.org_id orgId,qc.create_time createTime,qc.sjly sjly,
395 395
         ware.warehouse_name warehouseName,store.storehouse_name storehouseName,agent.agent_name agentName,
@@ -421,7 +421,7 @@
421 421
     </if>
422 422
     UNION ALL
423 423
     SELECT
424
-        qc.id,qc.agent_id agentId,qc.agent_depot_id agentDepotId,qc.notice,qc.business_number businessNumber,qc.car_brand carBrand,
424
+        qc.id,qc.agent_id agentId,qc.agent_depot_id agentDepotId,depot.depot_id agentOrgId,qc.notice,qc.business_number businessNumber,qc.car_brand carBrand,
425 425
         qc.business_type businessType,qc.lspz,qc.grain_number grainNumber,qc.storehouse_id storehouseId,
426 426
         qc.warehouse_id warehouseId,qc.crk_time crkTime,qc.org_id orgId,qc.create_time createTime,qc.sjly sjly,
427 427
         ware.warehouse_name warehouseName,store.storehouse_name storehouseName,agent.agent_name agentName,
@@ -460,8 +460,8 @@
460 460
   
461 461
   <!-- 查询代储库仓房货位信息 -->
462 462
   <select id="selectAgentHouseWareList" parameterType="java.util.Map" resultType="java.util.Map">
463
-    SELECT 
464
-    	a.depot_id+"" unitid,
463
+    SELECT
464
+        CAST(a.depot_id AS CHAR) unitid,
465 465
     	c.warehouse_id hwh,
466 466
     	c.qccrk_tbsj modifydate
467 467
     FROM business_agent_depot a

+ 9 - 3
src/main/java/com/chinaitop/depot/agent/number/controller/AgentNumberController.java

@@ -71,8 +71,10 @@ public class AgentNumberController {
71 71
     })
72 72
     public PageInfo<Map<String, Object>> getAgentNumberList(Integer pageNum, Integer pageSize, Integer agentId, Integer agentDepotId,
73 73
                                                                         Integer storehouseId, Integer warehouseId, String orgid){
74
-        Map<String,Object> map = new HashMap<>();
75
-        map.put("orgId",orgid);
74
+        Map<String,Object> map = new HashMap<String,Object>();
75
+        if (null != orgid && !"".equals(orgid)) {
76
+            map.put("orgId",orgid);
77
+        }
76 78
         if(ParameterUtil.isnotnull(agentId)){
77 79
             map.put("agentId",agentId);
78 80
         }
@@ -86,7 +88,9 @@ public class AgentNumberController {
86 88
             map.put("warehouseId",warehouseId);
87 89
         }
88 90
 
89
-        PageHelper.startPage(pageNum, pageSize);
91
+        if (null != pageNum && null != pageSize) {
92
+            PageHelper.startPage(pageNum, pageSize);
93
+        }
90 94
         List<Map<String, Object>> list = agentNumberService.getAgentNumberList(map);
91 95
         PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
92 96
         return pageInfo;
@@ -111,6 +115,7 @@ public class AgentNumberController {
111 115
         if (ParameterUtil.isnull(agent.getId())) {
112 116
             agent.setOrgId(orgId);
113 117
             agent.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//创建时间
118
+            agent.setSjly(0);
114 119
             agentNumberService.add(agent);
115 120
         } else {
116 121
             agentNumberService.update(agent);
@@ -262,6 +267,7 @@ public class AgentNumberController {
262 267
 					} else {
263 268
 						//插入代储点的库存实物表
264 269
 						agentNumber.setCreateTime(new Date());
270
+                        agentNumber.setSjly(1);
265 271
 						agentNumberService.add(agentNumber);
266 272
 					}
267 273
 

+ 28 - 13
src/main/java/com/chinaitop/depot/agent/number/mapper/BusinessAgentNumberMapper.xml

@@ -14,6 +14,7 @@
14 14
     <result column="inventory" property="inventory" jdbcType="VARCHAR" />
15 15
     <result column="org_id" property="orgId" jdbcType="INTEGER" />
16 16
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
17
+    <result column="sjly" property="sjly" jdbcType="INTEGER" />
17 18
     <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
18 19
   </resultMap>
19 20
   <sql id="Example_Where_Clause" >
@@ -76,7 +77,7 @@
76 77
   </sql>
77 78
   <sql id="Base_Column_List" >
78 79
     id, agent_id, agent_depot_id, storehouse_id, warehouse_id, lspz, nature, level, harvest_year, 
79
-    inventory, org_id, create_time, updatetime
80
+    inventory, org_id, create_time, sjly, updatetime
80 81
   </sql>
81 82
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.number.model.BusinessAgentNumberExample" >
82 83
     select
@@ -113,12 +114,12 @@
113 114
       storehouse_id, warehouse_id, lspz, 
114 115
       nature, level, harvest_year, 
115 116
       inventory, org_id, create_time, 
116
-      updatetime)
117
+      sjly, updatetime)
117 118
     values (#{id,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, #{agentDepotId,jdbcType=INTEGER}, 
118 119
       #{storehouseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, 
119 120
       #{nature,jdbcType=VARCHAR}, #{level,jdbcType=INTEGER}, #{harvestYear,jdbcType=INTEGER}, 
120 121
       #{inventory,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
121
-      #{updatetime,jdbcType=TIMESTAMP})
122
+      #{sjly,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP})
122 123
   </insert>
123 124
   <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.number.model.BusinessAgentNumber" >
124 125
     insert into business_agent_number
@@ -159,6 +160,9 @@
159 160
       <if test="createTime != null" >
160 161
         create_time,
161 162
       </if>
163
+      <if test="sjly != null" >
164
+        sjly,
165
+      </if>
162 166
       <if test="updatetime != null" >
163 167
         updatetime,
164 168
       </if>
@@ -200,6 +204,9 @@
200 204
       <if test="createTime != null" >
201 205
         #{createTime,jdbcType=TIMESTAMP},
202 206
       </if>
207
+      <if test="sjly != null" >
208
+        #{sjly,jdbcType=INTEGER},
209
+      </if>
203 210
       <if test="updatetime != null" >
204 211
         #{updatetime,jdbcType=TIMESTAMP},
205 212
       </if>
@@ -250,6 +257,9 @@
250 257
       <if test="record.createTime != null" >
251 258
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
252 259
       </if>
260
+      <if test="record.sjly != null" >
261
+        sjly = #{record.sjly,jdbcType=INTEGER},
262
+      </if>
253 263
       <if test="record.updatetime != null" >
254 264
         updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
255 265
       </if>
@@ -272,6 +282,7 @@
272 282
       inventory = #{record.inventory,jdbcType=VARCHAR},
273 283
       org_id = #{record.orgId,jdbcType=INTEGER},
274 284
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
285
+      sjly = #{record.sjly,jdbcType=INTEGER},
275 286
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
276 287
     <if test="_parameter != null" >
277 288
       <include refid="Update_By_Example_Where_Clause" />
@@ -313,6 +324,9 @@
313 324
       <if test="createTime != null" >
314 325
         create_time = #{createTime,jdbcType=TIMESTAMP},
315 326
       </if>
327
+      <if test="sjly != null" >
328
+        sjly = #{sjly,jdbcType=INTEGER},
329
+      </if>
316 330
       <if test="updatetime != null" >
317 331
         updatetime = #{updatetime,jdbcType=TIMESTAMP},
318 332
       </if>
@@ -332,23 +346,24 @@
332 346
       inventory = #{inventory,jdbcType=VARCHAR},
333 347
       org_id = #{orgId,jdbcType=INTEGER},
334 348
       create_time = #{createTime,jdbcType=TIMESTAMP},
349
+      sjly = #{sjly,jdbcType=INTEGER},
335 350
       updatetime = #{updatetime,jdbcType=TIMESTAMP}
336 351
     where id = #{id,jdbcType=INTEGER}
337 352
   </update>
338 353
 
339 354
   <select id="getDataByExample" parameterType="java.util.Map" resultType="java.util.HashMap">
340 355
     SELECT
341
-        num.id,num.agent_id agentId,num.agent_depot_id agentDepotId,num.lspz,num.nature,num.level,
342
-        num.harvest_year harvestYear,num.inventory,num.storehouse_id storehouseId,
343
-        num.warehouse_id warehouseId,num.create_time createTime,num.org_id orgId,
344
-        ware.warehouse_name warehouseName,store.storehouse_name storehouseName,agent.agent_name agentName,
345
-        depot.agent_depot_name agentDepotName
356
+    num.id,num.agent_id agentId,num.agent_depot_id agentDepotId,num.lspz,num.nature,num.level,
357
+    num.harvest_year harvestYear,num.inventory,num.storehouse_id storehouseId,
358
+    num.warehouse_id warehouseId,num.create_time createTime,num.org_id orgId,
359
+    ware.warehouse_name warehouseName,store.storehouse_name storehouseName,agent.agent_name agentName,
360
+    depot.agent_depot_name agentDepotName
346 361
     FROM
347
-        business_agent_number num
348
-        LEFT JOIN business_agent agent ON agent.id = num.agent_id AND agent.org_id = #{orgId,jdbcType=INTEGER}
349
-        LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id AND depot.org_id = #{orgId,jdbcType=INTEGER}
350
-        LEFT JOIN basic_storehouse store ON store.storehouse_id = num.storehouse_id
351
-        LEFT JOIN basic_warehouse ware ON ware.warehouse_id = num.warehouse_id
362
+    business_agent_number num
363
+    LEFT JOIN business_agent agent ON agent.id = num.agent_id AND agent.org_id = #{orgId,jdbcType=INTEGER}
364
+    LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id AND depot.org_id = #{orgId,jdbcType=INTEGER}
365
+    LEFT JOIN basic_storehouse store ON store.storehouse_id = num.storehouse_id
366
+    LEFT JOIN basic_warehouse ware ON ware.warehouse_id = num.warehouse_id
352 367
     WHERE num.org_id = #{orgId,jdbcType=INTEGER}
353 368
     <if test="agentId != null">
354 369
       AND num.agent_id = #{agentId,jdbcType=INTEGER}

+ 122 - 0
src/main/java/com/chinaitop/depot/agent/number/model/BusinessAgentNumber.java

@@ -27,108 +27,230 @@ public class BusinessAgentNumber {
27 27
 
28 28
     private Date createTime;
29 29
 
30
+    private Integer sjly;
31
+
30 32
     private Date updatetime;
31 33
 
34
+    /**
35
+     * 
36
+     * @return id 
37
+     */
32 38
     public Integer getId() {
33 39
         return id;
34 40
     }
35 41
 
42
+    /**
43
+     * 
44
+     * @param id 
45
+     */
36 46
     public void setId(Integer id) {
37 47
         this.id = id;
38 48
     }
39 49
 
50
+    /**
51
+     * 代储点id
52
+     * @return agent_id 代储点id
53
+     */
40 54
     public Integer getAgentId() {
41 55
         return agentId;
42 56
     }
43 57
 
58
+    /**
59
+     * 代储点id
60
+     * @param agentId 代储点id
61
+     */
44 62
     public void setAgentId(Integer agentId) {
45 63
         this.agentId = agentId;
46 64
     }
47 65
 
66
+    /**
67
+     * 代储库id
68
+     * @return agent_depot_id 代储库id
69
+     */
48 70
     public Integer getAgentDepotId() {
49 71
         return agentDepotId;
50 72
     }
51 73
 
74
+    /**
75
+     * 代储库id
76
+     * @param agentDepotId 代储库id
77
+     */
52 78
     public void setAgentDepotId(Integer agentDepotId) {
53 79
         this.agentDepotId = agentDepotId;
54 80
     }
55 81
 
82
+    /**
83
+     * 仓房id
84
+     * @return storehouse_id 仓房id
85
+     */
56 86
     public Integer getStorehouseId() {
57 87
         return storehouseId;
58 88
     }
59 89
 
90
+    /**
91
+     * 仓房id
92
+     * @param storehouseId 仓房id
93
+     */
60 94
     public void setStorehouseId(Integer storehouseId) {
61 95
         this.storehouseId = storehouseId;
62 96
     }
63 97
 
98
+    /**
99
+     * 货位id
100
+     * @return warehouse_id 货位id
101
+     */
64 102
     public Integer getWarehouseId() {
65 103
         return warehouseId;
66 104
     }
67 105
 
106
+    /**
107
+     * 货位id
108
+     * @param warehouseId 货位id
109
+     */
68 110
     public void setWarehouseId(Integer warehouseId) {
69 111
         this.warehouseId = warehouseId;
70 112
     }
71 113
 
114
+    /**
115
+     * 粮食品种
116
+     * @return lspz 粮食品种
117
+     */
72 118
     public Integer getLspz() {
73 119
         return lspz;
74 120
     }
75 121
 
122
+    /**
123
+     * 粮食品种
124
+     * @param lspz 粮食品种
125
+     */
76 126
     public void setLspz(Integer lspz) {
77 127
         this.lspz = lspz;
78 128
     }
79 129
 
130
+    /**
131
+     * 粮油性质
132
+     * @return nature 粮油性质
133
+     */
80 134
     public String getNature() {
81 135
         return nature;
82 136
     }
83 137
 
138
+    /**
139
+     * 粮油性质
140
+     * @param nature 粮油性质
141
+     */
84 142
     public void setNature(String nature) {
85 143
         this.nature = nature == null ? null : nature.trim();
86 144
     }
87 145
 
146
+    /**
147
+     * 等级
148
+     * @return level 等级
149
+     */
88 150
     public Integer getLevel() {
89 151
         return level;
90 152
     }
91 153
 
154
+    /**
155
+     * 等级
156
+     * @param level 等级
157
+     */
92 158
     public void setLevel(Integer level) {
93 159
         this.level = level;
94 160
     }
95 161
 
162
+    /**
163
+     * 收获年度
164
+     * @return harvest_year 收获年度
165
+     */
96 166
     public Integer getHarvestYear() {
97 167
         return harvestYear;
98 168
     }
99 169
 
170
+    /**
171
+     * 收获年度
172
+     * @param harvestYear 收获年度
173
+     */
100 174
     public void setHarvestYear(Integer harvestYear) {
101 175
         this.harvestYear = harvestYear;
102 176
     }
103 177
 
178
+    /**
179
+     * 库存数量(公斤)
180
+     * @return inventory 库存数量(公斤)
181
+     */
104 182
     public String getInventory() {
105 183
         return inventory;
106 184
     }
107 185
 
186
+    /**
187
+     * 库存数量(公斤)
188
+     * @param inventory 库存数量(公斤)
189
+     */
108 190
     public void setInventory(String inventory) {
109 191
         this.inventory = inventory == null ? null : inventory.trim();
110 192
     }
111 193
 
194
+    /**
195
+     * 组织结构id
196
+     * @return org_id 组织结构id
197
+     */
112 198
     public Integer getOrgId() {
113 199
         return orgId;
114 200
     }
115 201
 
202
+    /**
203
+     * 组织结构id
204
+     * @param orgId 组织结构id
205
+     */
116 206
     public void setOrgId(Integer orgId) {
117 207
         this.orgId = orgId;
118 208
     }
119 209
 
210
+    /**
211
+     * 创建时间
212
+     * @return create_time 创建时间
213
+     */
120 214
     public Date getCreateTime() {
121 215
         return createTime;
122 216
     }
123 217
 
218
+    /**
219
+     * 创建时间
220
+     * @param createTime 创建时间
221
+     */
124 222
     public void setCreateTime(Date createTime) {
125 223
         this.createTime = createTime;
126 224
     }
127 225
 
226
+    /**
227
+     * 数据来源(0是手动添加,1是同步出入库数据)
228
+     * @return sjly 数据来源(0是手动添加,1是同步出入库数据)
229
+     */
230
+    public Integer getSjly() {
231
+        return sjly;
232
+    }
233
+
234
+    /**
235
+     * 数据来源(0是手动添加,1是同步出入库数据)
236
+     * @param sjly 数据来源(0是手动添加,1是同步出入库数据)
237
+     */
238
+    public void setSjly(Integer sjly) {
239
+        this.sjly = sjly;
240
+    }
241
+
242
+    /**
243
+     * 
244
+     * @return updatetime 
245
+     */
128 246
     public Date getUpdatetime() {
129 247
         return updatetime;
130 248
     }
131 249
 
250
+    /**
251
+     * 
252
+     * @param updatetime 
253
+     */
132 254
     public void setUpdatetime(Date updatetime) {
133 255
         this.updatetime = updatetime;
134 256
     }

+ 78 - 0
src/main/java/com/chinaitop/depot/agent/number/model/BusinessAgentNumberExample.java

@@ -5,10 +5,19 @@ import java.util.Date;
5 5
 import java.util.List;
6 6
 
7 7
 public class BusinessAgentNumberExample {
8
+    /**
9
+     * business_agent_number
10
+     */
8 11
     protected String orderByClause;
9 12
 
13
+    /**
14
+     * business_agent_number
15
+     */
10 16
     protected boolean distinct;
11 17
 
18
+    /**
19
+     * business_agent_number
20
+     */
12 21
     protected List<Criteria> oredCriteria;
13 22
 
14 23
     public BusinessAgentNumberExample() {
@@ -64,6 +73,9 @@ public class BusinessAgentNumberExample {
64 73
         distinct = false;
65 74
     }
66 75
 
76
+    /**
77
+     * business_agent_number 2020-07-03
78
+     */
67 79
     protected abstract static class GeneratedCriteria {
68 80
         protected List<Criterion> criteria;
69 81
 
@@ -845,6 +857,66 @@ public class BusinessAgentNumberExample {
845 857
             return (Criteria) this;
846 858
         }
847 859
 
860
+        public Criteria andSjlyIsNull() {
861
+            addCriterion("sjly is null");
862
+            return (Criteria) this;
863
+        }
864
+
865
+        public Criteria andSjlyIsNotNull() {
866
+            addCriterion("sjly is not null");
867
+            return (Criteria) this;
868
+        }
869
+
870
+        public Criteria andSjlyEqualTo(Integer value) {
871
+            addCriterion("sjly =", value, "sjly");
872
+            return (Criteria) this;
873
+        }
874
+
875
+        public Criteria andSjlyNotEqualTo(Integer value) {
876
+            addCriterion("sjly <>", value, "sjly");
877
+            return (Criteria) this;
878
+        }
879
+
880
+        public Criteria andSjlyGreaterThan(Integer value) {
881
+            addCriterion("sjly >", value, "sjly");
882
+            return (Criteria) this;
883
+        }
884
+
885
+        public Criteria andSjlyGreaterThanOrEqualTo(Integer value) {
886
+            addCriterion("sjly >=", value, "sjly");
887
+            return (Criteria) this;
888
+        }
889
+
890
+        public Criteria andSjlyLessThan(Integer value) {
891
+            addCriterion("sjly <", value, "sjly");
892
+            return (Criteria) this;
893
+        }
894
+
895
+        public Criteria andSjlyLessThanOrEqualTo(Integer value) {
896
+            addCriterion("sjly <=", value, "sjly");
897
+            return (Criteria) this;
898
+        }
899
+
900
+        public Criteria andSjlyIn(List<Integer> values) {
901
+            addCriterion("sjly in", values, "sjly");
902
+            return (Criteria) this;
903
+        }
904
+
905
+        public Criteria andSjlyNotIn(List<Integer> values) {
906
+            addCriterion("sjly not in", values, "sjly");
907
+            return (Criteria) this;
908
+        }
909
+
910
+        public Criteria andSjlyBetween(Integer value1, Integer value2) {
911
+            addCriterion("sjly between", value1, value2, "sjly");
912
+            return (Criteria) this;
913
+        }
914
+
915
+        public Criteria andSjlyNotBetween(Integer value1, Integer value2) {
916
+            addCriterion("sjly not between", value1, value2, "sjly");
917
+            return (Criteria) this;
918
+        }
919
+
848 920
         public Criteria andUpdatetimeIsNull() {
849 921
             addCriterion("updatetime is null");
850 922
             return (Criteria) this;
@@ -906,6 +978,9 @@ public class BusinessAgentNumberExample {
906 978
         }
907 979
     }
908 980
 
981
+    /**
982
+     * business_agent_number
983
+     */
909 984
     public static class Criteria extends GeneratedCriteria {
910 985
 
911 986
         protected Criteria() {
@@ -913,6 +988,9 @@ public class BusinessAgentNumberExample {
913 988
         }
914 989
     }
915 990
 
991
+    /**
992
+     * business_agent_number 2020-07-03
993
+     */
916 994
     public static class Criterion {
917 995
         private String condition;
918 996