productDev/dmMes.git

			@@ -323,9 +323,9 @@
			if(!Objects.isNull(i.getInWarehouseId())){
			sub.append(i.getInWarehouseId());
			}
			// if(!Objects.isNull(i.getOutLocationId())){
			// sub.append(i.getOutLocationId());
			// }
			if(!Objects.isNull(i.getOutLocationId())){
			sub.append(i.getOutLocationId());
			}
			// if(!Objects.isNull(i.getInLocationId())){
			// sub.append(i.getInLocationId());
			// }
			@@ -894,6 +894,9 @@
			queryWStockDto.setQualityType(wTransferDetail.getQualityType());
			if(!Objects.isNull(wTransferDetail.getProcedureId())){
			queryWStockDto.setProcedureId(wTransferDetail.getProcedureId());
			}
			if(!Objects.isNull(wTransferDetail.getOutLocationId())){
			queryWStockDto.setLocationId(wTransferDetail.getOutLocationId());
			}
			//获取仓库信息根据
			Warehouse warehouse = warehouseMapper.selectById(wTransferDetail.getOutWarehouseId());
			@@ -2301,7 +2304,7 @@
			wOutboundDetail.setOutboundId(wOutbound.getId());
			wOutboundDetail.setMaterialId(wTransferDetail.getMaterialId());
			wOutboundDetail.setUnitId(wTransferDetail.getUnitId());
			wOutboundDetail.setBatch(wTransferDetail.getBatch());
			wOutboundDetail.setBatch(wStock.getBatch());
			wOutboundDetail.setWarehouseId(wOutbound.getWarehouseId());
			wOutboundDetail.setLocationId(wStock.getLocationId());
			wOutboundDetail.setNum(wTransferDetail.getOutActnum());

			@@ -124,6 +124,7 @@
			for (WTransferDetail wTransferDetail:wTransferDetailList) {
			QueryWStockNewDTO queryWStockNewDTO = new QueryWStockNewDTO();
			BeanUtils.copyProperties(wTransferDetail,queryWStockNewDTO);
			queryWStockNewDTO.setLocationId(wTransferDetail.getOutLocationId());
			stockNewDTOList.add(queryWStockNewDTO);
			}
			pageWrap.getModel().setStockNewDTOList(stockNewDTOList);

			@@ -906,6 +906,9 @@
			<if test="stockNewDTO.qualityType != null">
			and a.QUALITY_TYPE = #{stockNewDTO.qualityType}
			</if>
			<if test="stockNewDTO.locationId != null">
			and a.LOCATION_ID = #{stockNewDTO.locationId}
			</if>
			<if test="stockNewDTO.batch != null and stockNewDTO.batch != '' ">
			and a.BATCH = #{stockNewDTO.batch}
			</if>

	server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/doumeemes/service/ext/impl/WStockExtServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/resources/mappers/WStockExtMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史