From 3a8da212516aa11ba2a7d95c91dc87815fb23740 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 13 Apr 2023 17:24:24 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/entity/SfdcCancel.java |  1 +
 .../service/impl/DailyPlanServiceImpl.java    |  5 +++-
 src/main/resources/mapper/pad/PadMapper.xml   |  4 +--
 .../mapper/production/AbnormalMapper.xml      |  2 +-
 .../mapper/production/DailyPlanMapper.xml     |  2 +-
 .../static/js/pOReceipt/partInspect.js        |  2 +-
 .../resources/templates/pda/IssueReturn3.ftl  | 30 +++++++++++++++++++
 7 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java
index b00d7ba..2011999 100644
--- a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java
+++ b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java
@@ -12,6 +12,7 @@ public class SfdcCancel {
     private String site;
     private String orderNo;
     private Double itemNo;
+    private Double stopTime;
     private String operationDesc;
     private Integer seqNo;
     private String partNo;
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 c493cb7..6a2d511 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
@@ -1074,7 +1074,10 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         //判断是否群发所有部门异常信息 通过沟通看板，abnormalUser 表设定群发人员
         if("Y".equals(abList.get(0).getNeedInspectFlag())){
             Date date=DateUtil.getDateToDate(new Date(),"yyyy-MM-dd");
-            TaskDto taskDto=abnormalMapper.getOriginator();
+            // TaskDto taskDto=abnormalMapper.getOriginator();
+            TaskDto taskDto=new TaskDto();
+            taskDto.setSite(inData.getSite());
+            taskDto.setCreatedBy(inData.getFeedbackBy());
             taskDto.setCustomer(inData.getSeqNo().toString());
             taskDto.setProject("异常反馈");
             taskDto.setFinalStatus("未完成");
diff --git a/src/main/resources/mapper/pad/PadMapper.xml b/src/main/resources/mapper/pad/PadMapper.xml
index c94ea8f..efb977a 100644
--- a/src/main/resources/mapper/pad/PadMapper.xml
+++ b/src/main/resources/mapper/pad/PadMapper.xml
@@ -97,8 +97,8 @@
 
 
     <select id="getBomDetailData" resultType="com.heai.modules.production.entity.BOMDetailData">
-        select Site,PartNo,RevNo,ItemNo,ComponentPartNo,CompPartRevNo,QtyAssembly,QtyFixedScrapt,ScraptFactor,Remark,QtyAssemblyPerRecipe,
-        dbo.Get_Part_SpecDesc(Site,PartNo) partDesc,dbo.Get_Part_UMID(Site,PartNo) umid
+        select Site,PartNo,RevNo,ItemNo,ComponentPartNo,CompPartRevNo,QtyAssembly ,QtyFixedScrapt,ScraptFactor,Remark,QtyAssemblyPerRecipe,
+        dbo.Get_Part_SpecDesc(Site,ComponentPartNo) partDesc,dbo.Get_Part_UMID(Site,ComponentPartNo) umid
         from BOMDetail  where site = #{site,jdbcType=VARCHAR}  AND PartNo = #{partNo}  and RevNo=#{revNo}
     </select>
 
diff --git a/src/main/resources/mapper/production/AbnormalMapper.xml b/src/main/resources/mapper/production/AbnormalMapper.xml
index 1713ab1..941a2f3 100644
--- a/src/main/resources/mapper/production/AbnormalMapper.xml
+++ b/src/main/resources/mapper/production/AbnormalMapper.xml
@@ -79,6 +79,6 @@
         select a.site,a.userId AS responsiblePerson,b.department,#{createdBy} as  CreatedBy,GetDate() as createdDate,'未完成' as finalStatus
         ,'未受理' as status
         FROM AbnormalUser a left join [Users] b on a.userId=b.userID and  a.site=b.site
-         WHERE a.Originator='N' and  b.department is not  null
+         WHERE a.userId!=#{createdBy} and  b.department is not  null
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 6c84132..c7556d0 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -867,7 +867,7 @@
      <select id="getSfdcList" resultType="com.heai.modules.production.entity.SfdcCancel">
             select a.site,a.OrderNo,a.ItemNo ,a.SeqNo,a.WorkCenterNo,a.ReportDate,a.OperatorID,a.ReportQty,a.ApproveQty,a.ReportedManfTime,a.StatisticDate,
         a.AssJobSeqNo,a.Scheduled_ResourceId  ResourceID,b.S_ShiftNo ShiftNo,b.partNo,dbo.Get_ItemDesc(a.site,a.OrderNo,a.ItemNo) operation_desc,c.OperatorName,b.S_ShiftNo ShiftDesc,e.ResourceDesc,Reverseflag
-        ,a.reportWeight,a.approveWeight,a.moldQty
+        ,a.reportWeight,a.approveWeight,a.moldQty,a.stopTime
         from sfdc a LEFT JOIN SOScheduledRouting b on a.Site=b.Site and a.AssJobSeqNo=b.SeqNo
         left join Operator c on a.site=c.site and a.OperatorID=c.OperatorID
         left join WorkCenterResource e on a.Site=e.Site and a.Scheduled_ResourceId =e.ResourceID and a.WorkCenterNo=e.WorkCenterNo
diff --git a/src/main/resources/static/js/pOReceipt/partInspect.js b/src/main/resources/static/js/pOReceipt/partInspect.js
index 42eb502..1356ca4 100644
--- a/src/main/resources/static/js/pOReceipt/partInspect.js
+++ b/src/main/resources/static/js/pOReceipt/partInspect.js
@@ -122,7 +122,7 @@ function saveInspect() {
 	let inData={
 
 		stock:stock,
-		site:site,
+		site:$("#site").val(),
 		partNo:$("#partNo").val(),
 		userId:userName,
 		batchNo:$("#batchNo").val()
diff --git a/src/main/resources/templates/pda/IssueReturn3.ftl b/src/main/resources/templates/pda/IssueReturn3.ftl
index 89201b6..cfba6a4 100644
--- a/src/main/resources/templates/pda/IssueReturn3.ftl
+++ b/src/main/resources/templates/pda/IssueReturn3.ftl
@@ -146,6 +146,36 @@
 		<button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 55px;margin-left: 10%" data-toggle="modal" onclick="pageJump()">下一步</button>
 	</div>
 
+	<!-- 运单操作 -->
+	<div class="modal fade" id="issue_modal" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog"  style="width:260px; margin: 40% auto;">
+			<div class="modal-content" >
+				<div id="legend" style="background-color: #17b2a2;;color: #fff;">
+					<legend style="font-size: 18px;">退料信息</legend>
+				</div>
+				<div class="modal-body" style="padding: 1px 1px;">
+					<div class="ivu-form-item">
+						<label class="ivu-form-item-label" style="width: 70px;margin-top: 12%;text-align: left;">发料数量：</label>
+						<div class="ivu-input-wrapper ivu-input-type" style="width: 150px;">
+							<input id="qtyIssue" type="number" class="form-input-2">
+						</div>
+						<label class="ivu-form-item-label" style="width: 70px;margin-top: 12%;text-align: left;">公斤重量：</label>
+						<div class="ivu-input-wrapper ivu-input-type" style="width: 150px;">
+							<input id="qtyIssueKG" type="number" class="form-input-2">
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer" style="TEXT-ALIGN: center; margin-top: 0px;padding: 5px 5px;">
+					<div class="control-group" style="margin-left: 35px;">
+						<div class="controls">
+							<button class="btn btn-primary" id = "determine" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 44px;margin-left: -10%" data-toggle="modal" onclick="saveTable()">确定</button>
+							<button class="btn btn-primary" id="issue_cancel" data-dismiss="modal" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 44px;margin-left: 10%" data-toggle="modal">取消</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 
 
 </div>