zy-asrs.git - Gitblit

			@@ -76,12 +76,13 @@
			@RequestParam(required = false)String orderByType,
			@RequestParam Map<String, Object> param){
			EntityWrapper<Node> wrapper = new EntityWrapper<>();
			wrapper.ne("type",3);
			//wrapper.ne("type",3);
			excludeTrash(param);
			convert(param, wrapper);
			hostEq(wrapper);
			if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
			return R.parse("0-操作成功").add(nodeService.selectList(wrapper));
			List<Node> nodes = nodeService.selectList(wrapper);
			return R.parse("0-操作成功").add(nodes);
			}

			@RequestMapping(value = "/node/tree/auth")

			@@ -72,7 +72,7 @@
			//是否含有可补货出库的库位
			boolean flag = false;
			for (String locNo : locNosSearch){
			log.info("需要拣料的货位：" + locNo +"，需要补货的物料：" + mat.getMatnr());
			//log.info("需要拣料的货位：" + locNo +"，需要补货的物料：" + mat.getMatnr());
			if(Cools.isEmpty(locDetlService.selectByLocWithoutContainer(locNo))){
			flag = true;
			continue;

			@@ -206,9 +206,9 @@
			if (printMsgList[i] != null && printMsgList[i] !== '') {
			var barcodeUrl;
			if (type === 1) {
			barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"&param="+printMsgList[i]+"&width="+200+"&height="+70;
			barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"&param="+printMsgList[i]+"&width="+200+"&height="+70;
			} else {
			barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"&param="+printMsgList[i]+"&width="+400+"&height="+180;
			barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"&param="+printMsgList[i]+"&width="+400+"&height="+180;
			}
			data.push({
			item: printMsgList[i],

	src/main/java/com/zy/asrs/controller/NodeController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/node/node.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史