66

src/main/java/com/jtem/modules/board/entity/SOSRoutingBoardData.java

@@ -6,7 +6,7 @@ public class SOSRoutingBoardData extends SOScheduledRoutingOutData {
     private String lastLineName;
     private String lastRequireQty;
     private String lastReportQty;
-
+    private String lastSeqNoDoing;
     public String getLastLineName() {
         return lastLineName;
     }
@@ -30,4 +30,12 @@ public class SOSRoutingBoardData extends SOScheduledRoutingOutData {
     public void setLastReportQty(String lastReportQty) {
         this.lastReportQty = lastReportQty;
     }
+
+    public String getLastSeqNoDoing() {
+        return lastSeqNoDoing;
+    }
+
+    public void setLastSeqNoDoing(String lastSeqNoDoing) {
+        this.lastSeqNoDoing = lastSeqNoDoing;
+    }
 }

src/main/java/com/jtem/modules/board/service/impl/BoardServiceImpl.java

@@ -124,7 +124,6 @@ public class BoardServiceImpl implements BoardService {
         return map;
 
     }
-
     @Override
     public Map<String, Object> shopOrderBoard(BoardInData inData){
         int week= WeekUtil.getWeekOfYear(new Date());
@@ -139,28 +138,87 @@ public class BoardServiceImpl implements BoardService {
         List<ShopOrderBoardOutData> list =boardMapper.shopOrderBoard(inData);
         double number=list.size();
         int pageIndex=inData.getNumber();
-        int maxPage=(int)Math.ceil(number/18);
+        int maxPage=(int)Math.ceil(number/12);
         if(pageIndex>maxPage){
             pageIndex=1;
         }
         List<ShopOrderBoardOutData> result =new ArrayList<>();
         if(pageIndex<maxPage){
-            for(int i=0;i<18;i++){
-                result.add(list.get((pageIndex-1)*18+i));
+            for(int i=0;i<12;i++){
+                result.add(list.get((pageIndex-1)*12+i));
             }
         }else {
-            for(int i=0;(pageIndex-1)*18+i<number;i++){
-                result.add(list.get((pageIndex-1)*18+i));
+            for(int i=0;(pageIndex-1)*12+i<number;i++){
+                result.add(list.get((pageIndex-1)*12+i));
+            }
+        }
+
+
+        List<AbnormalFeedBackOutData> list2 =boardMapper.abnormalBoardList(inData);
+        double number2=list2.size();
+        int pageIndex2=inData.getNumber2();
+        int maxPage2=(int)Math.ceil(number2/5);
+        if(pageIndex2>maxPage2){
+            pageIndex2=1;
+        }
+        List<AbnormalFeedBackOutData> result2 =new ArrayList<>();
+        if(pageIndex2<maxPage2){
+            for(int i=0;i<5;i++){
+                result2.add(list2.get((pageIndex2-1)*5+i));
+            }
+        }else {
+            for(int i=0;(pageIndex2-1)*5+i<number2;i++){
+                result2.add(list2.get((pageIndex2-1)*5+i));
             }
         }
         Map<String, Object> map = new HashMap<>();
         map.put("maxPage", maxPage);
         map.put("rows", result);
         map.put("total",result.size());
+
+        map.put("maxPage2", maxPage2);
+        map.put("rows2", result2);
+        map.put("total2",result2.size());
         return map;
 
     }
 
+    // @Override
+    // public Map<String, Object> shopOrderBoard(BoardInData inData){
+    //     int week= WeekUtil.getWeekOfYear(new Date());
+    //     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+    //     Date date = new Date();
+    //     int year = Integer.parseInt(format.format(date).substring(0,4));
+    //     //获取本周的第一天和最后一天
+    //     String day1= DateUtil.getStringDate(WeekUtil.getFirstDayOfWeek(year,week));
+    //     String day2=DateUtil.getStringDate(WeekUtil.getLastDayOfWeek(year,week));
+    //     inData.setStartDate(day1);
+    //     inData.setEndDate(day2);
+    //     List<ShopOrderBoardOutData> list =boardMapper.shopOrderBoard(inData);
+    //     double number=list.size();
+    //     int pageIndex=inData.getNumber();
+    //     int maxPage=(int)Math.ceil(number/18);
+    //     if(pageIndex>maxPage){
+    //         pageIndex=1;
+    //     }
+    //     List<ShopOrderBoardOutData> result =new ArrayList<>();
+    //     if(pageIndex<maxPage){
+    //         for(int i=0;i<18;i++){
+    //             result.add(list.get((pageIndex-1)*18+i));
+    //         }
+    //     }else {
+    //         for(int i=0;(pageIndex-1)*18+i<number;i++){
+    //             result.add(list.get((pageIndex-1)*18+i));
+    //         }
+    //     }
+    //     Map<String, Object> map = new HashMap<>();
+    //     map.put("maxPage", maxPage);
+    //     map.put("rows", result);
+    //     map.put("total",result.size());
+    //     return map;
+    //
+    // }
+
     @Override
     public List<StockPrintData> getStockPrintListCaiGou(String ip){
         List<PrintInfoData> checkPrintData=boardMapper.checkCaigouPrintData("库存标签",ip);

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

@@ -6,7 +6,8 @@
         select a.Site,a.OrderNo,a.ItemNo,a.SeqNo,a.QtyRequired,a.QtyReported,a.QtyApprove,a.ClosedFlag,
         a.OutWorkFlag,a.S_ScheduledDate,a.S_ResourceID,a.S_ShiftNo,
         a.S_WorkCenterNo,a.mat_issueflag,a.partNo,b.QtyRequired lastRequireQty,b.QtyReported lastReportQty,
-        dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(b.site,b.WorkCenterNo)) lastLineName
+        dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(b.site,b.WorkCenterNo)) lastLineName,
+        dbo.get_lastStartingSeqNo(a.Site,a.OrderNo,a.ItemNo) lastSeqNoDoing
         from SOScheduledRouting a left join SORouting b on a.Site=b.Site and a.OrderNo=b.OrderNo
         and b.ItemNo=dbo.Get_SORouting_PreviousOperationItemNo(a.Site,a.OrderNo,a.ItemNo)
         <where>
@@ -35,7 +36,7 @@
     </select>
 
     <select id="shopOrderBoard" resultType="com.jtem.modules.board.entity.ShopOrderBoardOutData">
-        SELECT Site,OrderNo,NeedDate,PartNo,dbo.Get_PartDesc(site,partNo) partDesc,LotSize,Round(FinishedQty,2),Round(FinishedQty/LotSize*100.0,1) as percentQty
+        SELECT Site,OrderNo,NeedDate,PartNo,dbo.Get_PartDesc(site,partNo) partDesc,LotSize,Round(FinishedQty,2) FinishedQty,Round(FinishedQty/LotSize*100.0,1) as percentQty
         ,CustomerID,dbo.Get_CustomerDesc(Site,CustomerID) CustomerDesc,ReceiveDate
         FROM ShopOrder
         where status='已关闭' and ReceiveDate>=#{startDate} and #{endDate}>=ReceiveDate and MaterialSplitFlag='N'

src/main/resources/mapper/pda/PdaOrderMapper.xml

@@ -73,7 +73,7 @@
 
     <select id="getInventoryStockData" resultType="com.jtem.modules.Schedule.entity.InventoryStockData">
         select A.Site ,A.WarehouseID ,A.PartNo ,A.BatchNo ,A.LocationID ,A.FirstInDate ,A.LatestOutDate ,A.LatestInDate
-        ,A.ActiveDate ,A.InQty ,A.OutQty ,A.QtyOnHand ,A.QtyReserved ,A.InStandardValue ,A.InActualValue ,A.OutStandardValue
+        ,A.ActiveDate ,A.InQty ,A.OutQty ,Round(A.QtyOnHand,4)  QtyOnHand,A.QtyReserved ,A.InStandardValue ,A.InActualValue ,A.OutStandardValue
         ,A.OutActualValue ,A.PartnerID ,A.PartnerType ,A.LatestCountDate ,A.Freezeflag ,A.QtyTmp ,A.ManufactureDate
         ,A.ExpiredDate ,A.QtytoIssue ,A.DemandPartnerType ,A.DemandPartnerID ,A.DemandPartnerName
         ,B.WareHouseName