소스 검색

代储点下火车出入库同步和库存数量管理同步功能修改

fanxw 5 년 전
부모
커밋
09fdab49be

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

@@ -448,7 +448,6 @@
448
     <if test="lspz != null">
448
     <if test="lspz != null">
449
       AND hc.lspz = #{lspz,jdbcType=INTEGER}
449
       AND hc.lspz = #{lspz,jdbcType=INTEGER}
450
     </if>
450
     </if>
451
-    GROUP BY hc.inbound
452
     UNION 
451
     UNION 
453
 	SELECT
452
 	SELECT
454
     hc.id,hc.agent_id agentId,hc.agent_depot_id agentDepotId,hc.notice,hc.inbound,hc.train_no trainNo,
453
     hc.id,hc.agent_id agentId,hc.agent_depot_id agentDepotId,hc.notice,hc.inbound,hc.train_no trainNo,

+ 2 - 0
src/main/java/com/chinaitop/depot/agent/number/controller/AgentNumberController.java

@@ -118,6 +118,7 @@ public class AgentNumberController {
118
             agent.setSjly(0);
118
             agent.setSjly(0);
119
             agentNumberService.add(agent);
119
             agentNumberService.add(agent);
120
         } else {
120
         } else {
121
+        	agent.setSjly(0);
121
             agentNumberService.update(agent);
122
             agentNumberService.update(agent);
122
         }
123
         }
123
         modelMap.put("agentId", agent.getId());
124
         modelMap.put("agentId", agent.getId());
@@ -265,6 +266,7 @@ public class AgentNumberController {
265
 
266
 
266
 					if (null != list && list.size() > 0) {
267
 					if (null != list && list.size() > 0) {
267
 						agentNumber.setId(list.get(0).getId());
268
 						agentNumber.setId(list.get(0).getId());
269
+						agentNumber.setSjly(1);
268
 						agentNumberService.update(agentNumber);
270
 						agentNumberService.update(agentNumber);
269
 					} else {
271
 					} else {
270
 						//插入代储点的库存实物表
272
 						//插入代储点的库存实物表