成本分配表、出运明细调整

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

@@ -400,6 +400,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
                 }
                 Fabric.setSyTransfers(transferlist);
 //                Fabric.setFabrictransferQuantity(quantity);//转入数量
+                System.out.println("货物名称\t"+Fabric.getGoodsName()+"\tcost\t"+cost);
                 Fabric.setTransferCost(cost);
             }
 
@@ -500,7 +501,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
 
         System.out.println("国内加工单\t"+orderType+"\t面料含税成本美元\t"+syCostAllocation.getFabriccostIncludestaxUsd());
         System.out.println("fabriccostIncludestax集合\t"+fabriccostIncludestax);
-        if(/*!orderType.equals("国外加工单")||*/syCostAllocation.getFabriccostIncludestaxUsd()==null){
+        if(/*!orderType.equals("国外加工单")||*/ /*syCostAllocation.getFabriccostIncludestaxUsd()==null*/ fabriccostIncludestax!=null){
             if(fabriccostIncludestax.size()!=0){
                 for(SyCostAllocation str : fabriccostIncludestax){
                     for(SyCostAllocationFabric li:list3){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -481,8 +481,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			 strList.add(str);
 		 }
 		 QueryWrapper<SyShippingDetailsItem> syShippingDetailsItemQueryWrapper = new QueryWrapper<SyShippingDetailsItem>();
-		 syShippingDetailsItemQueryWrapper.in("id",strList).eq("del_flag",0).orderByAsc("sy_order_data_item_id");
-		 List<SyShippingDetailsItem> syShippingDetailsItemList = syShippingDetailsItemService.list(syShippingDetailsItemQueryWrapper);
+		 syShippingDetailsItemQueryWrapper.in("a.id",strList).eq("a.del_flag",0)/*.orderByAsc("a.sy_order_data_item_id")*/;
+		 List<SyShippingDetailsItem> syShippingDetailsItemList = syShippingDetailsService.getList(syShippingDetailsItemQueryWrapper);
 		 if(syShippingDetailsItemList.size()!=0){
 			 syShippingDetails.setSyShippingDetailsItemList(syShippingDetailsItemList);
 		 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/SyShippingDetailsMapper.java

@@ -90,4 +90,5 @@ public interface SyShippingDetailsMapper extends BaseMapper<SyShippingDetails> {
                      @Param("status") String status,
                      @Param("message") String message);
 
+    List<SyShippingDetailsItem> getList(@Param("ew")QueryWrapper<SyShippingDetailsItem> syShippingDetailsItemQueryWrapper);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -439,6 +439,16 @@ ${ew.customSqlSegment}
             where del_flag=0 and submit_status=1
               and (push_srm_state=0 or push_srm_state is null)
     </select>
+
+
+
+    <select id="getList" resultType="org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem">
+        select a.*from sy_shipping_details_item a
+        inner join sizetable b on a.size=b.size
+        ${ew.customSqlSegment}
+        ORDER BY num asc
+    </select>
+
     <!-- 回写SRM推送结果 -->
     <update id="setPurshInfo">
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/ISyShippingDetailsService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetails;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.*;
 
 import java.text.ParseException;
@@ -82,4 +83,6 @@ public interface ISyShippingDetailsService extends IService<SyShippingDetails> {
     void setPurshInfo(List<String> groupIdList,
                      String status,
                      String message);
+
+    List<SyShippingDetailsItem> getList(QueryWrapper<SyShippingDetailsItem> syShippingDetailsItemQueryWrapper);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -679,4 +679,9 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
         syShippingDetailsMapper.setPurshInfo(groupIdList,status,message);
     }
 
+    @Override
+    public List<SyShippingDetailsItem> getList(QueryWrapper<SyShippingDetailsItem> syShippingDetailsItemQueryWrapper) {
+        return syShippingDetailsMapper.getList(syShippingDetailsItemQueryWrapper);
+    }
+
 }