zy-asrs.git - Gitblit

			@@ -114,7 +114,7 @@
			}
			Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), wrapper);
			for (AgvLocDetl record : agvLocDetlPage.getRecords()) {
			OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", record.getThreeCode()).eq("matnr", record.getMatnr()).ne("order_no", record.getOrderNo()));
			OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", record.getThreeCode()).eq("matnr", record.getMatnr()).ne("order_no", record.getOrderNo()).ne("order_no", "DB" + record.getOrderNo()));
			if (orderDetl.getAnfme() - orderDetl.getQty() > 0) {
			record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
			} else {

			@@ -114,7 +114,9 @@
			List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
			List<Long> docIds = new ArrayList<>();
			for (DocType pakin : pakins) {
			docIds.add(pakin.getDocId());
			if (pakin.getDocId() != 33 && pakin.getDocId() != 34) {
			docIds.add(pakin.getDocId());
			}
			}

			wrapper.in("source",docIds);

			@@ -118,7 +118,8 @@

			for (PickParam.Pick pick : pickParams.getPicks()) {
			if (pick.getCount().equals(0D)) continue;
			AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("matnr", pick.getMatnr()).eq("three_code", pick.getThreeCode()));
			Double count = 0.0D;
			AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("matnr", pick.getMatnr()).eq("three_code", pick.getThreeCode()).eq("supp_code",pick.getSuppCode()));
			if (Cools.isEmpty(agvWrkDetl)) {
			AgvWrkDetl wrkDetl = new AgvWrkDetl();
			Mat mat = matService.selectByMatnr(pick.getMatnr());
			@@ -140,7 +141,7 @@
			} else {
			Double anfme = agvWrkDetl.getAnfme() + pick.getCount();
			agvWrkDetl.setAnfme(anfme);
			agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("matnr",agvWrkDetl.getMatnr()).eq("three_code",agvWrkDetl.getThreeCode()));
			agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("matnr",agvWrkDetl.getMatnr()).eq("three_code",agvWrkDetl.getThreeCode()).eq("supp_code",pick.getSuppCode()));

			}

	src/main/java/com/zy/asrs/controller/AgvLocDetlController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/controller/OrderDetlController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史