han\hanst 3 days ago
parent
commit
f5c5d0ac1f
  1. 4
      src/main/java/com/gaotao/modules/inspection/entity/UnqualifiedInspectionDto.java
  2. 2
      src/main/java/com/gaotao/modules/inspection/service/impl/IfsInspectionHistoryServiceImpl.java
  3. 4
      src/main/java/com/gaotao/modules/inspection/service/impl/InspectionInboundServiceImpl.java

4
src/main/java/com/gaotao/modules/inspection/entity/UnqualifiedInspectionDto.java

@ -8,6 +8,10 @@ import java.util.Date;
@Data @Data
public class UnqualifiedInspectionDto { public class UnqualifiedInspectionDto {
private String site; private String site;
/**
* IFS工厂编码PDA不合格处理扫描/确认必须用单据行contract不能用登录大site
*/
private String contract;
private String transNo; private String transNo;
private String itemNo; private String itemNo;
private String partNo; private String partNo;

2
src/main/java/com/gaotao/modules/inspection/service/impl/IfsInspectionHistoryServiceImpl.java

@ -78,7 +78,7 @@ public class IfsInspectionHistoryServiceImpl implements IfsInspectionHistoryServ
Map<String, Object> params = Map.of( Map<String, Object> params = Map.of(
"ifsDBName", ifsDBName, "ifsDBName", ifsDBName,
"domainUserID", getCurrentDomainUserID(), "domainUserID", getCurrentDomainUserID(),
"ifsSiteID", site,
"ifsSiteID", site+"%",
"ifsTransactionID", ifsTransId "ifsTransactionID", ifsTransId
); );

4
src/main/java/com/gaotao/modules/inspection/service/impl/InspectionInboundServiceImpl.java

@ -264,7 +264,9 @@ public class InspectionInboundServiceImpl implements InspectionInboundService {
if (unqualifiedQty != null && unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) { if (unqualifiedQty != null && unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
UnqualifiedInspectionDto dto = new UnqualifiedInspectionDto(); UnqualifiedInspectionDto dto = new UnqualifiedInspectionDto();
dto.setSite(ifsHistory.getContract()); // 使用contract作为site
// 列表行site与contract都落IFS工厂编码处理页按选中行contract作为实际site
dto.setSite(ifsHistory.getContract());
dto.setContract(ifsHistory.getContract());
dto.setTransNo(ifsHistory.getOrderNo() + "-"+ifsHistory.getLineNo()+ "-"+ifsHistory.getReleaseNo() dto.setTransNo(ifsHistory.getOrderNo() + "-"+ifsHistory.getLineNo()+ "-"+ifsHistory.getReleaseNo()
+ "-" + ifsHistory.getReceiptNo()); // 组合单据号 + "-" + ifsHistory.getReceiptNo()); // 组合单据号
dto.setItemNo(ifsHistory.getLineNo()); dto.setItemNo(ifsHistory.getLineNo());

Loading…
Cancel
Save