zy-asrs.git - Gitblit

			@@ -4,10 +4,7 @@
			import com.alibaba.excel.event.AnalysisEventListener;
			import com.alibaba.fastjson.JSON;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.core.common.BaseRes;
			import com.core.common.Cools;
			import com.core.common.R;
			import com.core.common.SpringUtils;
			import com.core.common.*;
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.LocDetl;
			import com.zy.asrs.entity.LocMast;
			@@ -194,7 +191,13 @@
			// locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
			// locDto.setOrigin(locDetl.getOrigin());
			// locDto.setWeight(locDetl.getWeight());
			locDetl.setMemo(outLocBoxC[3]);

			if (!Cools.isEmpty(outLocBoxC[3])){
			String memo = Cools.isEmpty(locDetl.getMemo())? "" : locDetl.getMemo()+"，";
			locDetl.setMemo(memo + DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C)+"手动输入备注：" + outLocBoxC[3]);
			} else if (Cools.isEmpty(locDetl.getMemo())){
			locDetl.setMemo(outLocBoxC[3]);
			}
			LocDto locDto = new LocDto(locDetl);
			locDtos.add(locDto);
			}

			@@ -250,9 +250,10 @@
			cols: [[
			{type: 'numbers'},
			{field: 'matnr', title: '规格', width: 160},
			{field: 'maktx', title: '商品名称', width: 160},
			{field: 'batch', title: '箱号'},
			{field: 'anfme', title: '数量'},
			// {field: 'maktx', title: '商品名称', width: 160},
			{field: 'batch', align: 'center', title: '箱号'},
			{field: 'model', align: 'center',title: '卷号'},
			// {field: 'anfme', align: 'center', title: '数量'},
			// {field: 'workQty', title: '作业数量'},

			// {field: 'unit', title: '单位'},
			@@ -263,10 +264,11 @@
			// },
			// {field: 'inQty', title: '已入库量'},
			// {field: 'color', title: '颜色'},
			{field: 'specs', title: '接头'},
			{field: 'danger$', title: '待判'},
			{field: 'qty$', title: '状态', style: 'font-weight: bold'},
			{field: 'source$', title: '是否确认', style: 'font-weight: bold'}
			{field: 'specs', align: 'center', title: '接头'},
			{field: 'danger$', align: 'center', title: '待判'},
			{field: 'memo', align: 'center', title: '备注'},
			{field: 'qty$', align: 'center', title: '状态', style: 'font-weight: bold'},
			{field: 'source$', align: 'center', title: '是否确认', style: 'font-weight: bold'}
			]],
			request: {
			pageName: 'curr',

	src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/order/order.js	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史