wms-master.git - Gitblit

			@@ -368,7 +368,9 @@
			}
			List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
			.eq(AsnOrderItem::getAsnCode, params.getAsnCode())
			.eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode()));
			.eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())
			.eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode())
			);

			if (Objects.isNull(asnOrderItem)) {
			throw new CoolException("单据明细不存在！！");
			@@ -958,7 +960,10 @@
			.setPoCode(asnOrderItem.getPoCode())
			.setAnfme(asnOrderItem.getAnfme())
			.setPurQty(asnOrderItem.getPurQty())
			.setSplrBatch(asnOrderItem.getSplrBatch());
			.setSplrBatch(asnOrderItem.getSplrBatch())
			.setMatnr(asnOrderItem.getMatnrCode())
			.setInspect(asnOrderItem.getIsptResult$()) //质检结果
			;

			Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
			if (Objects.isNull(matnr)) {
			@@ -967,12 +972,12 @@
			//SET 物料最大存放数量
			detlsDto.setMaxQty(matnr.getMaxQty())
			.setMatnrId(matnr.getId());
			QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
			.eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
			if (!Objects.isNull(inspect)) {
			//set 质检结果
			detlsDto.setInspect(inspect.getStatus$());
			}
			// QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
			// .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
			// if (!Objects.isNull(inspect)) {
			// //set 质检结果
			// detlsDto.setInspect(inspect.getStatus$());
			// }
			//获取当前库存信息
			LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
			// .eq(LocItem::getOrderItemId, asnOrderItem.getId())

			@@ -375,4 +375,22 @@
			}
			}

			public String getIsptResult$(){
			if (null == this.isptResult){ return null; }
			switch (this.isptResult){
			case 0:
			return "未检";
			case 1:
			return "合格";
			case 2:
			return "不合格";
			case 3:
			return "待定";
			case 4:
			return "部分合格";
			default:
			return "";
			}
			}

			}

	rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -23,5 +23,8 @@
			@ApiModelProperty("条形码")
			private String trackCode;

			@ApiModelProperty("物料编码")
			private String matnrCode;


			}

			@@ -85,6 +85,9 @@
			@ApiModelProperty("物料标识")
			private Long matnrId;

			@ApiModelProperty("物料编码")
			private String matnr;

			@ApiModelProperty("供应商编码")
			private String splrCode;