成本分配表调整

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

@@ -401,11 +401,8 @@
 
     <!-- 获取 头信息 主要是成衣委外及源头订单信息 -->
     <select id="queryByCostHead3" resultType="java.lang.String">
-		select distinct 销售订单号 contractno from VIEW_FabricLoss_Head_Clothes2 a
-        left join TimeberwordFunction.dbo.sy_shipping_details_item101 b
-        on a.contractno=b.销售订单号
-        where (trim(cCode) like '%${code}%' and cCode not like '%样%')
-        and 销售订单号 is not null
+        select distinct 销售订单号 contractno from TimeberwordFunction.dbo.sy_shipping_details_item101
+        where (trim(委外采购订单号) like '%${code}%' and 委外采购订单号 not like '%样%')and 销售订单号 is not null
 	</select>
 
     <!-- 获取 头信息 主要是成衣委外及源头订单信息 -->

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

@@ -18,7 +18,7 @@
 
 	<select id="queryByCostShipdetail" resultType="org.jeecg.modules.cost.entity.SyCostAllocationShipdetail">
 
-		select* from VIEW_fenpei_chuyunmingxi where ccode like  CONCAT('%',#{code},'%') order by outdata;
+		select* from VIEW_fenpei_chuyunmingxi where ccode like  CONCAT(#{code},'%') order by outdata;
 	</select>
 
 	<!--<select id="queryByCostShipdetail" resultType="org.jeecg.modules.cost.entity.SyCostAllocationShipdetail">

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

@@ -498,8 +498,9 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         System.out.println("fabriccostIncludestaxUsd2\t"+syCostAllocation.getFabriccostIncludestaxUsd());
         System.out.println("fabriccostIncludestax\t"+syCostAllocation.getFabriccostIncludestax());
 
-
-        if(!orderType.equals("国内加工单")||syCostAllocation.getFabriccostIncludestaxUsd()==null){
+        System.out.println("国内加工单\t"+orderType+"\t面料含税成本美元\t"+syCostAllocation.getFabriccostIncludestaxUsd());
+        System.out.println("fabriccostIncludestax集合\t"+fabriccostIncludestax);
+        if(/*!orderType.equals("国外加工单")||*/syCostAllocation.getFabriccostIncludestaxUsd()==null){
             if(fabriccostIncludestax.size()!=0){
                 for(SyCostAllocation str : fabriccostIncludestax){
                     for(SyCostAllocationFabric li:list3){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/xml/FabricLossMapper.xml

@@ -4,7 +4,7 @@
 
 	<!-- 获取 头信息 主要是成衣委外及源头订单信息 -->
 	<select id="getFabricLossData" resultType="org.jeecg.modules.report.entity.FabricLoss">
-		select distinct * from VIEW_FabricLoss_Head_Clothes where (trim(cCode) like '%${code}%' and cCode not like '%样%')
+		select distinct * from VIEW_FabricLoss_Head_Clothes where cCode like '%${code}%'
 	</select>
 	<!-- 获取计划员 103的面料委外制单人，供应商分类是染厂的 -->
 	<select id="getPlanner" resultType="java.lang.String">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -2852,6 +2852,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						jsonObject.put("AUTOID_DIS",map.get("AutoID"));
 						////System.out.println("map\t"+map);
 						getcFree(jsonObject,map);
+						jsonObject.put("ITAXUNITPRICE",map.get("iTaxUnitPrice"));
 						//invoices.remove(map);
 						bool=false;
 						break;