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 854ce73..078e48c 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
@@ -1791,9 +1791,9 @@ public class DailyPlanServiceImpl implements DailyPlanService {
}
@Override
public ShopOrderData selectShopOrder(DailyPlanInData dailyPlanInData) {
- if (!StringUtils.hasText(dailyPlanInData.getSite())){
- throw new RuntimeException("工厂编码为空!");
- }
+ // if (!StringUtils.hasText(dailyPlanInData.getSite())){
+ // throw new RuntimeException("工厂编码为空!");
+ // }
if (Objects.isNull(dailyPlanInData.getSeqNo())){
throw new RuntimeException("请输入派工单号");
}
@@ -1801,6 +1801,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
if(null == soScheduledRoutingOutDataList || soScheduledRoutingOutDataList.isEmpty()){
throw new RuntimeException("该派工单不存在");
}
+ dailyPlanInData.setSite(soScheduledRoutingOutDataList.get(0).getSite());
SOScheduledRoutingOutData soScheduledRouting = soScheduledRoutingOutDataList.get(0);
if (!"日计划派工单".equals(soScheduledRouting.getScheduleType())){
throw new RuntimeException("只有硫化生产需要模具");
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index cb03c39..c57b415 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -1057,9 +1057,7 @@
and seqNo=#{seqNo}
-
- and Site=#{site}
-
+
diff --git a/src/main/resources/static/js/pda/scanningOfVulcanizedMold1.js b/src/main/resources/static/js/pda/scanningOfVulcanizedMold1.js
index 7d3c70f..7ea03b1 100644
--- a/src/main/resources/static/js/pda/scanningOfVulcanizedMold1.js
+++ b/src/main/resources/static/js/pda/scanningOfVulcanizedMold1.js
@@ -41,7 +41,7 @@ function getShopOrder(){
}
let jsonData = {
seqNo : orderNoSearch,
- site:site,
+ // site:site,
}
requestPost("/pdaOrder/selectShopOrder",jsonData,successShopOrder)
}