袋装拆袋

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++;
         }

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;
 

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());
         }

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
         <where>
             <if test="params.seqNo != null">
                 and plr.seq_no = #{params.seqNo}
@@ -235,7 +235,7 @@
                 and plr.part_no like #{params.partNo}
             </if>
             <if test="params.partDesc != null and params.partDesc != ''">
-                and p.PartDescription like #{params.partDesc}
+                and p.PartDescription + isnull(' / ' + p.Spec, '') like #{params.partDesc}
             </if>
             <if test="params.status != null and params.status != ''">
                 and plr.status = #{params.status}
@@ -244,6 +244,6 @@
                 and plr.parent_id = #{params.parentId}
             </if>
         </where>
-        order by plr.seq_no desc, plr.item_no
+        order by plr.seq_no desc,plr.update_time
     </select>
 </mapper>

src/main/resources/mapper/production/SoScheduledListMapper.xml

@@ -332,50 +332,6 @@
     </select>
 
     <select id="queryVulcanizationList" resultType="com.heai.modules.production.entity.LiuhuaViewData">
-        select a.site,
-        a.orderNo,
-        a.SeqNo,
-        Round(a.QtyRequired, 2)                                               QtyRequired,
-        Round(a.QtyReported, 2)                                               QtyReported,
-        Round(a.QtyApprove, 2)                                                QtyApprove,
-        Convert(varchar(20), Convert(DECIMAL(20, 1), a.QtyReported * 100 / a.QtyRequired)) +'%'                                                                as liuhuaWancheng,
-        dbo.Get_seqNo_firstReportTime(a.site, a.SeqNo)                        firstReportDate2,
-        S_ScheduledDate                                                    as ScheduledDate,
-        S_ShiftNo                                                          as shiftNo,
-        dbo.Get_OperatorDesc(a.site, a.operatorId)                         as operatorDesc,
-        a.partNo,
-        dbo.Get_Part_SpecDesc(a.site, a.partNo)                               partSpec,
-        Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '修边'), 0), 3)) +'%'                                                                as xiubianWancheng,
-        Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '烘烤'), 0), 3)) +'%'                                                                as hongkaoWancheng,
-        Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '检验'), 0), 3)) +'%'                                                                as jianyanWancheng,
-        Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '加工'), 0), 3)) +'%'                                                                as jiagongWancheng,
-        Convert(varchar(20), Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site, a.SeqNo, '包装'), 0), 3)) +'%'                                                                as baozhuangWancheng,
-        (select Convert(DECIMAL(20, 2),sum(f.QtyApprove * dbo.Get_SPBOMQtyAssembly(f.site, f.orderNo)) * 100.0 /a.QtyReported)
-        from SOScheduledRouting f
-        where f.materSeqNo = a.SeqNo
-        and dbo.Get_ProductionLineDesc(f.site, dbo.Get_WorkCenter_ProLineNo(f.site, f.S_WorkCenterNo)) like
-        '%检验%'
-        and f.QtyReported > 0)                                          as liuhuahegelv
-        ,
-        z.TillTime                                                         as liuhuaTime,
-        dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '修边') as xiubianTime,
-        dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '烘烤') as hongkaoTime,
-        dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '检验') as jianyanTime,
-        dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '加工') as jiagongTime,
-        dbo.Get_liuhuaView_gongxu_firstReportTime(a.site, a.SeqNo, '包装') as baozhuangTime
-        from SOScheduledRouting a
-        left join SFDC_TimeHist z on a.site = z.Site and a.SeqNo = z.SeqNo and z.HistSeqNo = 1
-        <where>
-            AND a.scheduleType = '日计划派工单'
-            and a.QtyReported > 0
-            <if test="query.firstReportDate2Flag != null and query.firstReportDate2Flag != '' and query.firstReportDate2Flag == 'Y'.toString()">
-                and GETDATE() >= dbo.Get_seqNo_firstReportTime(a.site, a.SeqNo)
-
-                and (dbo.Get_SoScheduleRouting_CloseFlag(a.site, a.SeqNo, N'修边') = 'N'
-                or dbo.Get_SoScheduleRouting_CloseFlag(a.site, a.SeqNo, N'烘烤') = 'N'
-                or dbo.Get_SoScheduleRouting_CloseFlag(a.site, a.SeqNo, N'检验') = 'N'
-                or dbo.Get_SoScheduleRouting_CloseFlag(a.site, a.SeqNo, N'加工') = 'N')
-            </if>
-        </where>
+        exec dbo.get_KANBAN_LiuHua_Data '1','2025-04-02'
     </select>
 </mapper>