diff --git a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java index d6c57ad..6644901 100644 --- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java +++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java @@ -64,6 +64,8 @@ public class SoReceiveCasesData extends SoReceiveCases { + + diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java index 79c3444..0c8a9b5 100644 --- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java +++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java @@ -203,6 +203,8 @@ public class SoReceiveCases { + + diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 00937ca..893c59c 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -1417,7 +1417,7 @@ public class ScheduleServiceImpl implements ScheduleService { //查询bom行数据 List> 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; diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index c327457..d5f000e 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/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} @@ -1329,6 +1329,7 @@ OrderNo orderNo, CONVERT(INT, ItemNo) itemNo, ComponentPartNo partNo, + dbo.Get_PartDesc(Site, ComponentPartNo) partDesc, QtyAssembly qtyAssembly, QtyFixedScrapt qtyFixedScrapt, ScraptFactor scraptFactor,