成本分配

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

@@ -251,6 +251,17 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
                                          HttpServletRequest req){
         Page<CostAllocationReview> page = new Page<CostAllocationReview>(pageNo, pageSize);
         IPage<CostAllocationReview> pageList = syCostLossReviewService.queryCostAllocation(sy,page);
+
+        for(CostAllocationReview li:pageList.getRecords()){
+            //查询指派人
+            String name = syCostLossReviewMapper.querySyApprovalAssignedBy2(li.getPlanNum());
+            if(oConvertUtils.isNotEmpty(name)){
+                li.setApprovalMan(name);
+            }else{
+                li.setApprovalMan("");
+            }
+
+        }
         return Result.OK(pageList);
     }
 

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

@@ -345,6 +345,7 @@
         <if test="sy.status != null and sy.status !=''">
             AND a.status = #{sy.status}
         </if>
+        group by a.plan_num
 
     </select>
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -103,7 +103,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
     <select id="queryItem" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
 
         <if test='type == "成衣"'>
-            select t.id, t.syShippingOrderItemId, t.englishName, t.styleNumber, t.smailPo,t.createBy,
+            select GROUP_CONCAT(t.id) as id, t.syShippingOrderItemId, t.englishName, t.styleNumber, t.smailPo,t.createBy,
             sum(t.number) as number,
             sum(t.boxNumber) as boxNumber,t.pkOrg,
             sum(t.grossWeight) as grossWeight,
@@ -113,7 +113,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
             t.distributionPoint, t.containerCode, t.containerNumber, t.unitPrice, t.preShipmentDate,
             t.salesman, t.operatingDepartment, t.purOrSubOrder,
             t.outsourcingFactoryForProcurement,
-            t.memo, t.sort, t.readyFabric, t.tailoringFabricId, t.tailoringFabricItemId,t.clientAbbreviation,
+            t.memo, t.sort, t.readyFabric, GROUP_CONCAT(t.tailoringFabricId) as tailoringFabricId, GROUP_CONCAT(t.tailoringFabricItemId) as tailoringFabricItemId,t.clientAbbreviation,
             t.supplier
             from (
             SELECT GROUP_CONCAT(a.id) as id, a.sy_shipping_order_item_id as syShippingOrderItemId, a.english_name as