diff --git a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java b/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
index bd3c0a9..1fb0b54 100644
--- a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
+++ b/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
@@ -201,6 +201,7 @@ public class FunctionServiceImpl implements FunctionService {
.set(PrintLabelRecord::getBatchNo,productionWarehouseData.getBatchNo())
.set(PrintLabelRecord::getWarehouseId,productionWarehouseData.getWarehouseId())
.set(PrintLabelRecord::getLocationId,productionWarehouseData.getLocationId())
+ .set(PrintLabelRecord::getUpdateTime,new Date())
.update();
i++;
}
diff --git a/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java b/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java
index 1e40823..5ae7d26 100644
--- a/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java
+++ b/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java
@@ -40,6 +40,8 @@ public class PrintLabelRecord {
private Long parentId;
+ private Date updateTime;
+
@TableField(exist = false)
private String qrCodeContent;
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index a17ef5b..2b45cab 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -1462,12 +1462,13 @@ public class DailyPlanServiceImpl implements DailyPlanService {
}
}
}
+ log.info("1465");
WorkCenterResourceData workCenterResourceData=new WorkCenterResourceData();
workCenterResourceData.setSite(inData.getSite());
workCenterResourceData.setResourceID(getSOScheduledRoutingOutData.get(0).getsResourceID());
workCenterResourceData.setWorkCenterNo(getSOScheduledRoutingOutData.get(0).getsWorkCenterNo());
WorkCenterResourceData getWorkCenterResourceData= dailyPlanMapper.getWorkCenterResourceData(workCenterResourceData);
- if(checkShopOrder.getPartNo().startsWith("SP")||"Y".equals(getWorkCenterResourceData.getFqcFlag())) {
+ if(checkShopOrder.getPartNo().startsWith("SP") || "Y".equals(getWorkCenterResourceData.getFqcFlag())) {
String transNo = dailyPlanMapper.getTransNo();
checkUserSeqNo.get(0).setTransNo(transNo);
checkUserSeqNo.get(0).setToTypeFlag("开工检验单");
@@ -1475,6 +1476,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
dailyPlanMapper.saveSOOpsTransferHeaderForShiYanShi(checkUserSeqNo.get(0));
dailyPlanMapper.saveSOOpsTransferDetailForShiYanShi(checkUserSeqNo.get(0));
}
+ log.info("1479");
if(inData.getTvId()!=null&&!"".equals(inData.getTvId())){
updateTvBase(checkUserSeqNo.get(0).getSite(),inData.getTvId(),inData.getSeqNo(),checkUserSeqNo.get(0).getOperatorId());
}
diff --git a/src/main/resources/mapper/production/PrintLabelRecordMapper.xml b/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
index e927b18..b19f92a 100644
--- a/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
+++ b/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
@@ -217,13 +217,13 @@
plr.scan_seq_no,
plr.warehouse_id,
plr.parent_id,
+ plr.update_time,
sr.OrderNo,
- p.PartDescription as partDesc,
- olc.print_id
+ p.PartDescription + ' / ' + isnull(p.Spec, '') as partDesc,
+ (select top 1 olc.print_id from outbound_label_scan olc where plr.id = olc.print_id) as print_id
from print_label_record plr
left join SOScheduledRouting sr on plr.site = sr.Site and plr.seq_no = sr.SeqNo
left join Part p on plr.site = p.Site and plr.part_no = p.PartNo
- left join outbound_label_scan olc on plr.id = olc.print_id
and plr.seq_no = #{params.seqNo}
@@ -235,7 +235,7 @@
and plr.part_no like #{params.partNo}
- and p.PartDescription like #{params.partDesc}
+ and p.PartDescription + isnull(' / ' + p.Spec, '') like #{params.partDesc}
and plr.status = #{params.status}
@@ -244,6 +244,6 @@
and plr.parent_id = #{params.parentId}
- order by plr.seq_no desc, plr.item_no
+ order by plr.seq_no desc,plr.update_time
\ No newline at end of file
diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml
index fbc6741..0537b9f 100644
--- a/src/main/resources/mapper/production/SoScheduledListMapper.xml
+++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml
@@ -332,50 +332,6 @@
\ No newline at end of file