0412更新

src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java

@@ -311,6 +311,8 @@ public interface DailyPlanMapper {
      */
     SfdcTimeHistData getsfdcTimeHistData(StartSeqNoData inData);
 
+    String getSeqNoSite(int  seqNo);
+
     /**
      * @Description 暂停派工单
      * @Title updateStopWork

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -670,7 +670,10 @@ public class DailyPlanServiceImpl implements DailyPlanService {
 
     @Override
     public void addSkill(WorkCenterData inData){
-
+        List<WorkCenterData> check=  dailyPlanMapper.checkWorkCenterOperatorData(inData);
+        if(check.size()==0){
+            dailyPlanMapper.addSkill(inData);
+        }
     }
 
     @Override
@@ -853,6 +856,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
 
     @Override
     public SOScheduledRoutingOutData searchSeqNo(SOScheduledRoutingOutData inData){
+        inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo()));
         StartSeqNoData startSeqNoData=new StartSeqNoData();
         startSeqNoData.setSeqNo(inData.getSeqNo());
         startSeqNoData.setSite(inData.getSite());
@@ -869,6 +873,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
 
     @Override
     public void startSeqNo(StartSeqNoData inData){
+        inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo()));
         SfdcTimeHistData sfdcTimeHistData=dailyPlanMapper.getsfdcTimeHistData(inData);
         if(sfdcTimeHistData==null){
             throw new RuntimeException("派工单不存在或者结束！");
@@ -884,6 +889,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
     @Override
     @Transactional
     public void stopWork(StartSeqNoData inData){
+        inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo()));
         SfdcTimeHistData sfdcTimeHistData=dailyPlanMapper.getsfdcTimeHistData(inData);
         if(sfdcTimeHistData==null){
             throw new RuntimeException("派工单不存在或者结束！");
@@ -904,6 +910,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
     @Override
     @Transactional
     public void continueWork(StartSeqNoData inData){
+        inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo()));
         SfdcTimeHistData sfdcTimeHistData=dailyPlanMapper.getsfdcTimeHistData(inData);
         if(sfdcTimeHistData==null){
             throw new RuntimeException("派工单不存在或者结束！");
@@ -947,7 +954,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             throw new RuntimeException("派工单已关闭！");
         }
         if(BigDecimalUtils.compareTo(saveData.getQtyReported(),new BigDecimal(0))==0){
-            throw new RuntimeException("派工单已未报工无法关闭,请取消或者流转！");
+            throw new RuntimeException("派工单尚未报工无法关闭,请取消或者流转！");
         }
         dailyPlanMapper.closeSchedule(inData);
     }

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

@@ -436,7 +436,7 @@
         select top 1 Site,OrderNo,ItemNo,SeqNo,QtyRequired,QtyReported,QtyApprove,TimeRequired,TimeReported,
         BarcodeID,Remark,Crewsize,ClosedFlag,S_ScheduledDate,S_ResourceID,S_ScheduledSeqNo,S_ShiftNo,
         S_WorkCenterNo, EnteredDate,scheduleType,operatorId,partNo,dbo.Get_PartDesc(Site,partNo) as partDesc,
-        dbo.Get_OperatorDesc(Site,operatorId) as operatorName,dbo.Get_ItemDesc(site,orderRef1) as itemDesc,orderRef1 ,
+        dbo.Get_OperatorDesc(Site,operatorId) as operatorName,dbo.Get_ItemDesc(site,orderNo) as itemDesc,orderRef1 ,
         dbo.Get_WorkCenterDesc(Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_DescSpec(Site,partNo) as partSpec,closedFlag,outWorkFlag
         from SOScheduledRouting
         where site=#{site} and SeqNo=#{seqNo}
@@ -453,6 +453,9 @@
     <select id="getsfdcTimeHistData" resultType="com.heai.modules.production.entity.SfdcTimeHistData">
         select top 1  site,OrderNo,ItemNo,SeqNo,#{username} as Enteredby ,ClosedFlag,OutWorkFlag from SOScheduledRouting  where site=#{site} and SeqNo=#{seqNo} and ClosedFlag='N'
     </select>
+      <select id="getSeqNoSite"  resultType="String">
+        select site from SOScheduledRouting  where SeqNo=#{seqNo}
+    </select>
 
     <select id="checkSfdcTimeHistData" resultType="com.heai.modules.production.entity.SfdcTimeHistData">
         select site,OrderNo,ItemNo,SeqNo from SFDC_TimeHist where site=#{site} and seqNo=#{seqNo} and EventDesc='开始生产' and CompletedFlag='N'

src/main/resources/static/js/pda/transferWarehousing2ForHunlian.js

@@ -1,6 +1,6 @@
 var userId = $("#current_id").val();
 var userName = $("#current_username").val();
-var site = $("#current_site").val();
+
 
 var titleName = $("#current_titleName").val();
 
@@ -24,6 +24,7 @@ $(function(){
     if(workData != null && workData !==""){
         currentData = JSON.parse(workData);
         $("#warehouseQty").val(currentData.lotSize);
+        var site = currentData.site;
         // if(currentData.weightFactor!='-1'&&currentData.weightFactor!=''&&currentData.weightFactor!=null){
         //     $("#warehouseQtyKG").val((currentData.lotSize*currentData.weightFactor).toFixed(1));
         // }else {
@@ -42,7 +43,7 @@ $(function(){
 // 获取库位信息
 function getWarehouse(){
     let jsonData = {
-        site : site,
+        site : currentData.site,
         userId : userId,
         functionName : "Get_Users_AccessWarehouse_List",
     }
@@ -109,7 +110,7 @@ function getWarehouse(){
 // 获取批号信息
 function getBatchType(){
     let jsonData = {
-        site : site,
+        site : currentData.site,
         partNo : currentData.partNo,
         functionName : "dbo.Get_Part_BatchCreatedMethod",
     }
@@ -201,7 +202,7 @@ function receiveFlag(){
         }
     }
     let jsonData = {
-        site : site,
+        site : currentData.site,
         /*warehouseDate : warehouseDate,
         warehouseId : warehouseId,
         locationId : locationId,