zy-asrs.git - Gitblit

			@@ -307,6 +307,9 @@
			HashMap<String, Object> map = new HashMap<>();

			Mat mat = matService.selectByMatnr(nccXsckmxTkWms.getWlbm());
			if (mat == null) {
			continue;
			}
			MatParam matParam = new MatParam();
			Synchro.Copy(mat, matParam);
			matParam.setBatch(nccXsckmxTkWms.getVbatchcode());

			@@ -38,6 +38,8 @@
			@Autowired
			private WrkDetlService wrkDetlService;
			@Autowired
			private WrkMastService wrkMastService;
			@Autowired
			private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;

			@Autowired

			@@ -101,12 +101,12 @@
			select awd.*
			from asr_wrk_detl awd
			left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no and awd.io_time = awm.io_time
			where order_no = #{orderNo}
			where order_no = #{orderNo} and awm.io_type != 103
			union
			select distinct awdl.*
			from asr_wrk_detl_log awdl
			left join asr_wrk_mast_log awml on awdl.wrk_no = awml.wrk_no and awdl.io_time = awml.io_time
			where awdl.order_no = #{orderNo}
			where awdl.order_no = #{orderNo} and awml.io_type != 103
			and (awml.manu_type is null or awml.manu_type != '手动取消')
			</select>

			@@ -37,10 +37,11 @@
			,{field: 'batch', align: 'center',title: '批次'}
			,{field: 'sku', align: 'center',title: 'U8旧品名'}
			,{field: 'specs', align: 'center',title: '规格'}
			,{field: 'anfme', align: 'center',title: '数量'}
			,{field: 'anfme', align: 'center',title: '主数量'}
			,{field: 'weight', align: 'center',title: '辅数量'}
			,{field: 'unit', align: 'center',title: '单位', hide: false}
			,{field: 'qty', align: 'center',title: '作业数量', style: 'font-weight: bold'}
			,{field: 'manu', align: 'center',title: '辅单位'}
			// ,{field: 'qty', align: 'center',title: '作业数量', style: 'font-weight: bold'}
			,{field: 'enableQty', align: 'center',title: '待出数量', style: 'font-weight: bold'}
			// ,{field: 'name', align: 'center',title: '名称'}
			// ,{field: 'model', align: 'center',title: '型号'}
			@@ -162,7 +163,7 @@
			{field: 'orderNo', title: '单据编号', merge: true, align: 'center'},
			{field: 'title', title: '商品', merge: true, align: 'center', width: 350},
			{field: 'batch', title: '批次', align: 'center'},
			{field: 'anfme', title: '数量', align: 'center', width: 90, style: 'font-weight: bold'},
			{field: 'anfme', title: '主数量', align: 'center', width: 90, style: 'font-weight: bold'},
			{field: 'weight', title: '辅数量', align: 'center', width: 90, style: 'font-weight: bold'},
			{field: 'unit', align: 'center',title: '单位'},
			{field: 'locNo', title: '货位', align: 'center', width: 100, templet: '#locNoTpl'},

	src/main/java/com/zy/asrs/controller/MobileController.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/asrs/WrkDetlMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/orderPakout/out.js	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史