zy-asrs.git - Gitblit

			@@ -64,7 +64,7 @@
			EntityWrapper<Mat> wrapper = new EntityWrapper<>();
			if (!Cools.isEmpty(condition)) {
			// wrapper.like("matnr", condition).or().like("maktx", condition);
			wrapper.like("matnr", condition).or().like("maktx", condition);
			wrapper.like("matnr", condition).or().like("maktx", condition).or().like("model", condition);
			}
			wrapper.orderBy("create_time", false);
			List<Mat> mats = matService.selectList(wrapper);

			@@ -129,6 +129,7 @@
			{field: 'proType', title: '属性'},
			{field: 'outOrderNo', title: '合同号'},
			{field: 'temp1',title: '名称总称'},
			{field:'temp2', title: '客户图号'},
			{field: 'anfme', title: '数量'},
			{field: 'workQty', title: '作业数量'},
			{field: 'qty', title: '完成数量', style: 'font-weight: bold'},
			@@ -244,8 +245,8 @@
			{field: 'proType', title: '属性', edit: true},
			{field: 'model', title: '代码', edit: true},
			{field: 'outOrderNo', title: '合同号', edit: true},

			{field: 'threeCode', title: '第三方代码'},
			{field: 'temp2', title: '客户图号',edit:true},
			// {field: 'threeCode', title: '第三方代码'},
			{field: 'specs', title: '规格'},
			{field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
			{field: 'workQty', title: '作业数量', minWidth: 100, width: 100},

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