zy-asrs.git - Gitblit

			@@ -60,7 +60,7 @@
			agvLocDetl.setLocNo(locNo);
			this.insert(agvLocDetl);
			// 流水 -- 新增订单明细
			OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode());
			OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
			// FlowLog flowLog = new FlowLog();
			// flowLog.setFid(String.valueOf(flowId));
			// flowLog.setSpare2(String.valueOf(taskCode));
			@@ -314,8 +314,7 @@
			try {
			if (excelVersion == 2003) {
			book = new HSSFWorkbook(inStream);
			}
			else { // 当 excel 是 2007 时
			} else { // 当 excel 是 2007 时
			book = new XSSFWorkbook(inStream);
			}
			} catch (Exception e) {

			@@ -52,6 +52,8 @@
			return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, batch, threeCode);
			}



			@Override
			public OrderDetl selectItemNoneOfBatch(String orderNo, String matnr) {
			return this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);

			@@ -108,8 +108,6 @@
			@Autowired
			private OrderDetlService orderDetlService;
			@Autowired
			private OrderDetlService orderDetlService;
			@Autowired
			private SnowflakeIdWorker snowflakeIdWorker;
			@Autowired
			private FlowLogService flowLogService;
			@@ -119,7 +117,6 @@
			//用于上报mes的工作档明细
			List<AgvWrkDetl> agvWrkDetlListOld = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));

			try {
			long flowId = snowflakeIdWorker.nextId();
			Date now = new Date();
			try{
			@@ -443,7 +440,7 @@
			agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
			if(!isJSON(orderNo)){
			//检查订单是否已完成
			orderService.checkComplete(orderNo);
			orderService.checkComplete(orderNo, agvWrkMast.getPltType());
			}else{
			List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
			maps.forEach(map -> {
			@@ -501,12 +498,12 @@
			agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
			if(!isJSON(orderNo)){
			//检查订单是否已完成
			orderService.checkComplete(orderNo);
			orderService.checkComplete(orderNo, agvWrkMast.getPltType());
			}else{
			List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
			maps.forEach(map -> {
			String o = map.get("orderNo").toString();
			orderService.checkComplete(o);
			orderService.checkComplete(o, agvWrkMast.getPltType());
			});
			}
			//上报mes

	src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史