2025-11-25

过站采集-》材料上机增加物料编码和物料名称

src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java

@@ -64,6 +64,8 @@ public class SoReceiveCasesData extends SoReceiveCases {
 
 
 
+
+
 
 
 

src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java

@@ -203,6 +203,8 @@ public class SoReceiveCases {
 
 
 
+
+
 
 
 

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1417,7 +1417,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         //查询bom行数据
         List<Map<String, Object>> resultList = scheduleMapper.getBomItemNosByPartNo(inData);
         //判断是否存在
-        if (resultList.size() == 0) {
+        if (resultList.isEmpty()) {
             throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200166) + inData.getOrderNo() + "/" + cRollInfo.getPartNo());
         }
         return resultList;

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -1318,7 +1318,7 @@
         cri.orderref3        orderRef3,
         case when  cri.status='冻结' then 'Y' else 'N' end     frozenFlag
         FROM inventory_stock cri
-        LEFT JOIN Part part ON part.Site = cri.site AND part.PartNo = cri.part_no
+        inner JOIN Part part ON part.Site = cri.site AND part.PartNo = cri.part_no
         WHERE cri.site = #{site}
         AND cri.roll_no = #{rmRollNo}
     </select>
@@ -1329,6 +1329,7 @@
                OrderNo                              orderNo,
                CONVERT(INT, ItemNo)                 itemNo,
                ComponentPartNo                      partNo,
+               dbo.Get_PartDesc(Site, ComponentPartNo) partDesc,
                QtyAssembly                          qtyAssembly,
                QtyFixedScrapt                       qtyFixedScrapt,
                ScraptFactor                         scraptFactor,