成本分配，托书推送

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/SyCostAllocationMapper.java

@@ -22,4 +22,8 @@ public interface SyCostAllocationMapper extends BaseMapper<SyCostAllocation> {
 
     List<SyCostJson> queryByCostJson(@Param("planNum")String planNum,
                              @Param("pageStart")Integer pageStart,@Param("pageEnd")Integer pageEnd);
+
+    //查询改计划号的所有采购发票
+    @DS("multi-three")
+    SyCostAllocation queryPurBillVouchByFabric(@Param("code") String code);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationMapper.xml

@@ -119,4 +119,39 @@
         inner JOIN UFDATA_101_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode 
         WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenAbbName
     </select>
+
+
+    <select id="queryPurBillVouchByFabric" resultType="org.jeecg.modules.cost.entity.SyCostAllocation">
+
+
+	select t.iOriSum as fabriccostIncludestax,t.iNotOriMoney as fabriccostNotincludestax, t.cExchRate as fabriccostIncludestaxUsd from (
+	select sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,4)) as iNotOriMoney,CONVERT(DECIMAL(38,2),sum(pbs.iOriSum)*max(pb.cExchRate)) as cExchRate from UFDATA_101_2021.dbo.PO_Pomain pm
+	join UFDATA_101_2021.dbo.PO_Podetails pd on pm.POID = pd.POID
+	join UFDATA_101_2021.dbo.PurBillVouchs pbs on pd.ID = pbs.iPOsID
+	join UFDATA_101_2021.dbo.PurBillVouch pb on pb.PBVID  = pbs.PBVID
+	join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=pd.cInvCode
+	where pm.cPOID like CONCAT(#{code},'%') and (omi.cInvCcode like '03%' or omi.cInvCcode like '04%') and omi.cInvCCode != '0399' and omi.cInvCCode != '0499' and omi.cInvCCode != '0299' and pb.cVenCode not in('T010001','T020001')
+
+	UNION ALL
+
+select sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,2)) as iNotOriMoney,CONVERT(DECIMAL(38,2),sum(pbs.iOriSum)*max(pb.cExchRate)) as cExchRate from UFDATA_102_2021.dbo.PO_Pomain pm
+	join UFDATA_102_2021.dbo.PO_Podetails pd on pm.POID = pd.POID
+	join UFDATA_102_2021.dbo.PurBillVouchs pbs on pd.ID = pbs.iPOsID
+	join UFDATA_102_2021.dbo.PurBillVouch pb on pb.PBVID  = pbs.PBVID
+	join UFDATA_102_2021.dbo.Inventory omi on omi.cInvCode=pd.cInvCode
+	where pm.cPOID like CONCAT(#{code},'%') and (omi.cInvCcode like '03%' or omi.cInvCcode like '04%') and omi.cInvCCode != '0399' and omi.cInvCCode != '0499' and omi.cInvCCode != '0299' and pb.cVenCode not in('T010001','T020001')
+
+		UNION ALL
+
+
+select sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,4)) as iNotOriMoney,CONVERT(DECIMAL(38,2),sum(pbs.iOriSum)*max(pb.cExchRate)) as cExchRate from UFDATA_103_2021.dbo.PO_Pomain pm
+	join UFDATA_103_2021.dbo.PO_Podetails pd on pm.POID = pd.POID
+	join UFDATA_103_2021.dbo.PurBillVouchs pbs on pd.ID = pbs.iPOsID
+	join UFDATA_103_2021.dbo.PurBillVouch pb on pb.PBVID  = pbs.PBVID
+	join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=pd.cInvCode
+	where pm.cPOID like CONCAT(#{code},'%') and (omi.cInvCcode like '03%' or omi.cInvCcode like '04%') and omi.cInvCCode != '0399' and omi.cInvCCode != '0499' and omi.cInvCCode != '0299' and pb.cVenCode not in('T010001','T020001')
+		) t where t.iOriSum is not null
+
+
+	</select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -205,6 +205,13 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
             //美元面料含税成本和不含税成本
             syCostAllocation.setFabriccostIncludestaxUsd(syCostAllocation.getFabriccostNotincludestax().divide(syCostAllocation.getExchangeRate(),2,BigDecimal.ROUND_HALF_UP));
             syCostAllocation.setFabriccostNotincludestaxUsd(syCostAllocation.getFabriccostNotincludestax().divide(syCostAllocation.getExchangeRate(),2,BigDecimal.ROUND_HALF_UP));
+        }else{
+            //根据计划号查找该计划号下所有采购发票含税金额和不含税金额（不含税金额 = 含税金额/1.13）
+            SyCostAllocation fabriccostIncludestax = syCostAllocationMapper.queryPurBillVouchByFabric(plannum);
+
+            syCostAllocation.setFabriccostIncludestax(fabriccostIncludestax.getFabriccostIncludestax());
+            syCostAllocation.setFabriccostNotincludestax(fabriccostIncludestax.getFabriccostNotincludestax());
+            syCostAllocation.setFabriccostIncludestaxUsd(fabriccostIncludestax.getFabriccostIncludestaxUsd());
         }
 
         /*如果出现多供应商的情况拼接 供应商*/
@@ -216,8 +223,13 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         }
         //供应商事故金额 美元和人民币
         SyCostAllocationAccident accidentEntity = syCostAllocationAccidentMapper.queryByCostAccidentAmount(plannum);
-        syCostAllocation.setSupperAccidentcnyAmount(accidentEntity.getSupperAccidentcnyAmount());
-        syCostAllocation.setSupperAccidentUsdamount(accidentEntity.getSupperAccidentUsdamount());
+        if(accidentEntity !=null){
+            syCostAllocation.setSupperAccidentcnyAmount(accidentEntity.getSupperAccidentcnyAmount());
+            syCostAllocation.setSupperAccidentUsdamount(accidentEntity.getSupperAccidentUsdamount());
+        }else{
+            syCostAllocation.setSupperAccidentcnyAmount(BigDecimal.ZERO);
+            syCostAllocation.setSupperAccidentUsdamount(BigDecimal.ZERO);
+        }
 
         /*查询U8数据 面料*/
         List<SyCostAllocationFabric> list3 = syCostAllocationFabricMapper.queryByCostFabric(plannum);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/controller/SyCostLossReviewController.java

@@ -66,9 +66,9 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
        IPage<SyCostLossReview> nullList = new Page<>();
        List<String> sumList = new ArrayList<>();
        if(syCostLossReview.getPlanNo()=="" || syCostLossReview.getPlanNo()==null){
-           if(syCostLossReview.getFstatus()!=null && syCostLossReview.getFstatus()!="" || oConvertUtils.isNotEmpty(syCostLossReview.getFfirstApproveDate())){
+           if(syCostLossReview.getFstatus()!=null && syCostLossReview.getFstatus()!="" || oConvertUtils.isNotEmpty(syCostLossReview.getFfirstApproveDateB())){
                //查面损的数据
-               List<String> list= syCostLossReviewService.queryCodeByfstatus(syCostLossReview.getFstatus(),syCostLossReview.getFfirstApproveDate());
+               List<String> list= syCostLossReviewService.queryCodeByfstatus(syCostLossReview.getFstatus(),syCostLossReview.getFfirstApproveDateB(),syCostLossReview.getFfirstApproveDateE());
                if(list.size()<1){
                    return Result.OK(nullList);
                }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/SyCostLossReview.java

@@ -53,6 +53,11 @@ public class SyCostLossReview {
 
 	private String ffirstApproveDate;
 
+
+	//查询条件审核结束日期
+	private String ffirstApproveDateB;
+	private String ffirstApproveDateE;
+
 	private String ffinalApproveDate;
 
 	private String fstatus;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/SyCostLossReviewMapper.java

@@ -32,7 +32,7 @@ public interface SyCostLossReviewMapper extends BaseMapper<SyCostLossReview> {
     @DS("multi-one")
     List<String> queryCodeBymaker(@Param("maker")String maker);
 
-    List<String> queryCodeByfstatus(@Param("status")String status,@Param("ffirstApproveDate")String ffirstApproveDate);
+    List<String> queryCodeByfstatus(@Param("status")String status,@Param("ffirstApproveDateB")String ffirstApproveDateB,@Param("ffirstApproveDateE")String ffirstApproveDateE);
     List<String> queryCodeBycstatus(@Param("status")String status);
     List<String> queryCodeByPlanTable(@Param("remarks")String remarks,@Param("planMan")String planMan);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -314,8 +314,8 @@
         <if test='status !="" and status != null'>
             and status=#{status}
         </if>
-        <if test='ffirstApproveDate !="" and ffirstApproveDate != null'>
-            and first_approve_date like concat(#{ffirstApproveDate},'%')
+        <if test='ffirstApproveDateB !="" and ffirstApproveDateB != null'>
+            and first_approve_date between concat(#{ffirstApproveDateB},'%') and concat(#{ffirstApproveDateE},'%')
         </if>
 
     </select>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/ISyCostLossReviewService.java

@@ -23,7 +23,7 @@ public interface ISyCostLossReviewService extends IService<SyCostLossReview> {
      SyCostLossReview querySyFabricLossByCode(String planCode);
      SyCostLossReview queryCostAllocationByCode(String planCode);
      List<String> queryCodeBymaker(String maker);
-     List<String> queryCodeByfstatus(String status,String ffirstApproveDate);
+     List<String> queryCodeByfstatus(String status,String ffirstApproveDateB,String ffirstApproveDateE);
      List<String> queryCodeBycstatus(String status);
      List<String> queryCodeByPlanTable(String remarks,String planMan);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/impl/SyCostLossReviewServiceImpl.java

@@ -62,8 +62,8 @@ public class SyCostLossReviewServiceImpl extends ServiceImpl<SyCostLossReviewMap
     }
 
     @Override
-    public List<String> queryCodeByfstatus(String status,String ffirstApproveDate) {
-        return syCostLossReviewMapper.queryCodeByfstatus(status,ffirstApproveDate);
+    public List<String> queryCodeByfstatus(String status,String ffirstApproveDateB,String ffirstApproveDateE) {
+        return syCostLossReviewMapper.queryCodeByfstatus(status,ffirstApproveDateB,ffirstApproveDateE);
     }
 
     @Override

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -650,12 +650,15 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			 } else {
 				 entity.setLatestDateOfShipment("");
 			 }
-
+			 int sort = 1;
 			 // 只要不是成品，需要做汇总操作，汇总条件为报关品名+HSCODE
 			 if (entity.getReadyFabric().equals("成衣")) {
 				 readyFabric = "申报要素-成衣";
 				 list = syShippingOrderMapper.queryEelement(id);
+
 				 for (SyShippingOrderItem li : list) {
+				 	 li.setSize(sort);
+				 	 sort++;
 					 totalGrossWeight = totalGrossWeight.add(li.getGrossWeight());
 					 totalNetweight = totalNetweight.add(li.getNetWeight());
 					 tatolNumber = tatolNumber.add(li.getNumber());
@@ -668,6 +671,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 readyFabric = "申报要素-面辅料";
 				 list = syShippingOrderMapper.queryEelementMerge(id);
 				 for (SyShippingOrderItem li : list) {
+					 li.setSize(sort);
+					 sort++;
 					 totalGrossWeight = totalGrossWeight.add(li.getGrossWeight());
 					 totalNetweight = totalNetweight.add(li.getNetWeight());
 					 tatolNumber = tatolNumber.add(li.getNumber());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrderItem.java

@@ -334,4 +334,7 @@ public class SyShippingOrderItem {
 	//最早交期
 	@TableField(exist = false)
 	private String earliestDeliveryDate;
+	//报关单序号
+	@TableField(exist = false)
+	private Integer size;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -807,6 +807,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
             }else{
                 BigDecimal mo = new BigDecimal(sumMoney).subtract(sumImoney).setScale(2,BigDecimal.ROUND_HALF_UP);
                 listmaps.get(listmaps.size()-1).put("iMoney",(new BigDecimal(listmaps.get(listmaps.size()-1).get("iMoney").toString()).add(mo)));
+                listmaps.get(listmaps.size()-1).put("INatMoney",(new BigDecimal(listmaps.get(listmaps.size()-1).get("iMoney").toString()).add(mo)));
             }
 
             //循环新增主表