0412更新

src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@@ -1,5 +1,6 @@
 package com.heai.modules.production.controller;
 
+import com.heai.common.annotation.RepeatSubmit;
 import com.heai.common.utils.R;
 import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData;
 import com.heai.modules.production.entity.*;
@@ -244,6 +245,7 @@ public class DailyPlanController {
         List<GenerateReportData> resultList = dailyPlanService.getGenerateReportList(generateReportData);
         return R.ok().put("rows", resultList).put("total",resultList.size());
     }
+    @RepeatSubmit
     @PostMapping("/saveGenerateReport")
     public R saveGenerateReport(@RequestBody GenerateReportData generateReportData){
 

src/main/java/com/heai/modules/production/entity/StockPrintData.java

@@ -63,6 +63,7 @@ public class StockPrintData {
     private String seqNo;
     private String status;
     private Integer printQty;
+    private Double weight;
     public String getPartDesc() {
         return partDesc;
     }
@@ -206,5 +207,13 @@ public class StockPrintData {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
 }
 

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

@@ -1423,6 +1423,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         List<OperatorData> operatorList=dailyPlanMapper.getOperatorData(indata);
 
         TvSopBaseData saveData=new TvSopBaseData();
+        //不传id就是按照派工单清除数据
         if("".equals(tvId)){
             saveData.setTvId(tvId);
             saveData.setNowSeqNo(seqNo);

src/main/resources/mapper/board/BoardMapper.xml

@@ -191,12 +191,12 @@
         order By a.S_ScheduledDate,a.seqNo
     </select>
     <select id="getStockPrintList" resultType="com.heai.modules.production.entity.StockPrintData">
-        select a.PrintQty,b.TransNo,b.Site,b.WareHouseId,b.BatchNo,b.LocationId,b.PartNo,b.OrderNo,b.TransDate,b.Qty,b.PrintFlag,b.site+'|'+ b.PartNo+'|'+b.WareHouseId+'|'+b.BatchNo+'|'+b.LocationId as seqNo
+        select a.PrintQty,b.TransNo,b.Site,b.WareHouseId,b.BatchNo,b.LocationId,b.PartNo,b.OrderNo,b.TransDate,b.Qty,b.PrintFlag,b.site+'|'+ b.PartNo+'|'+b.WareHouseId+'|'+b.BatchNo+'|'+b.LocationId as seqNo,Round(dbo.Get_Part_NetWeight(b.Site,b.PartNo)*b.Qty/1000,2) weight
         ,dbo.Get_Part_DescSpec(a.Site,b.PartNo) partDesc,dbo.Get_WareHouseDesc(b.Site,b.WareHouseId) as wareHouseDesc,dbo.Get_Part_UMID(b.Site,b.PartNo) umid,dbo.get_expiredDate_print(b.Site,b.PartNo,b.BatchNo) expiredDate
         from print_info a left join StockPrint b on a.site=b.site and a.orderref1=b.TransNo where a.status='N' and a.orderref2='库存标签'
     </select>
   <select id="getStockPrintListHunlian" resultType="com.heai.modules.production.entity.StockPrintData">
-        select a.PrintQty,b.TransNo,b.Site,b.WareHouseId,b.BatchNo,b.LocationId,b.PartNo,b.OrderNo,b.TransDate,b.Qty,b.PrintFlag,b.site+'|'+ b.PartNo+'|'+b.WareHouseId+'|'+b.BatchNo+'|'+b.LocationId as seqNo
+        select a.PrintQty,b.TransNo,b.Site,b.WareHouseId,b.BatchNo,b.LocationId,b.PartNo,b.OrderNo,b.TransDate,b.Qty,b.PrintFlag,b.site+'|'+ b.PartNo+'|'+b.WareHouseId+'|'+b.BatchNo+'|'+b.LocationId as seqNo,Round(dbo.Get_Part_NetWeight(b.Site,b.PartNo)*b.Qty/1000,2) weight
         ,dbo.Get_Part_DescSpec(a.Site,b.PartNo) partDesc,dbo.Get_WareHouseDesc(b.Site,b.WareHouseId) as wareHouseDesc,dbo.Get_Part_UMID(b.Site,b.PartNo) umid,dbo.get_expiredDate_print(b.Site,b.PartNo,b.BatchNo) expiredDate
         from print_info a left join StockPrint b on a.site=b.site and a.orderref1=b.TransNo where a.status='N' and a.orderref2='混炼库存标签'
     </select>
@@ -205,7 +205,7 @@
      ,D.Remark,D.OrderRef4 orderNo,T.EnterDate as TransDate,D.transQty qty,T.WarehouseID wareHouseId
      ,D.Site ,D.BatchNo,D.LocationID LocationId,D.site+'|'+ D.PartNo+'|'+T.WareHouseId+'|'+D.BatchNo+'|'+D.LocationId as seqNo
      ,dbo.Get_WareHouseDesc(T.Site,T.WarehouseID) as wareHouseDesc, dbo.get_expiredDate_print(D.Site,D.PartNo,D.BatchNo)  ExpiredDate,p.id,p.printQty
-     ,dbo.Get_StorePrintPartStatus(D.Site,D.PartNo,D.BatchNo) status
+     ,dbo.Get_StorePrintPartStatus(D.Site,D.PartNo,D.BatchNo) status,Round(dbo.Get_Part_NetWeight(D.Site,D.PartNo)*D.transQty/1000,2) weight
       from TransDetail as D,TransHeader as t,print_info p
       Where T.Site=D.Site and T.TransNo=D.TransNo
         and D.Site=p.site and D.TransNo=p.orderref1

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

@@ -521,7 +521,7 @@
         Group by QtyReported
     </select>
     <select id="getStockPrint" resultType="com.heai.modules.production.entity.StockPrintData">
-        select TransNo,Site,WareHouseId,BatchNo,LocationId,PartNo,OrderNo,TransDate,Qty,PrintFlag,dbo.Get_PartDesc(Site,PartNo) as partDesc
+        select TransNo,Site,WareHouseId,BatchNo,LocationId,PartNo,OrderNo,TransDate,Qty,PrintFlag,dbo.Get_PartDesc(Site,PartNo) as partDesc,Round(dbo.Get_Part_NetWeight(Site,PartNo)*Qty/1000,2) weight
         ,dbo.Get_WareHouseDesc(Site,WareHouseId) as wareHouseDesc,dbo.Get_Part_UMID(Site,PartNo) umid,dbo.get_expiredDate_print(Site,PartNo,BatchNo) expiredDate
         ,dbo.Get_StorePrintPartStatus(Site,PartNo,BatchNo) status
         from StockPrint