1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/InOutWarehouseTask.java

@@ -326,6 +326,21 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
      */
     @TableField(exist = false)
     private Double bond;
+    /**
+     * 合同重量
+     */
+    @TableField(exist = false)
+    private Double contractWeight;
+    /**
+     * 合同单价
+     */
+    @TableField(exist = false)
+    private String contractPrice;
+    /**
+     * 非粮款收款
+     */
+    @TableField(exist = false)
+    private Double nonGrainCollection;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -1261,7 +1261,10 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         sheet.setColumnWidth(5, 12 * 256 + 184);
         sheet.setColumnWidth(6, 12 * 256 + 184);
         sheet.setColumnWidth(7, 12 * 256 + 184);
-        sheet.setColumnWidth(8, 1 * 256 + 184);
+        sheet.setColumnWidth(8, 12 * 256 + 184);
+        sheet.setColumnWidth(9, 12 * 256 + 184);
+        sheet.setColumnWidth(10, 12 * 256 + 184);
+        sheet.setColumnWidth(11, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -1297,6 +1300,12 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(7);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(8);
+        cell.setCellStyle(styleTitle);
+        cell = row0.createCell(9);
+        cell.setCellStyle(styleTitle);
+        cell = row0.createCell(10);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         Map<String, Object> pageView = new HashMap<>();
@@ -1318,15 +1327,24 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         cell.setCellValue(" 未回款（元）");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(4);
-        cell.setCellValue(" 保证金（元）");
+        cell.setCellValue("保证金（元）");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(5);
-        cell.setCellValue("销售任务编号");
+        cell.setCellValue("非粮款收款（元）");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(6);
-        cell.setCellValue("任务已完成量（吨）");
+        cell.setCellValue("合同重量（吨）");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(7);
+        cell.setCellValue("合同单价（元/吨）");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(8);
+        cell.setCellValue("销售任务编号");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(9);
+        cell.setCellValue("任务已完成量（吨）");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(10);
         cell.setCellValue("出货库点");
         cell.setCellStyle(styleDetail);
         rownum++;
@@ -1352,12 +1370,21 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 cell.setCellValue(editDouble(inOutWarehouseTask1.getBond()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(5);
+                cell.setCellValue(editDouble(inOutWarehouseTask1.getNonGrainCollection()));
+                cell.setCellStyle(contextstyle);
+                cell = rowx.createCell(6);
+                cell.setCellValue(editDouble(inOutWarehouseTask1.getContractWeight()));
+                cell.setCellStyle(contextstyle);
+                cell = rowx.createCell(7);
+                cell.setCellValue(editString(inOutWarehouseTask1.getContractPrice()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(8);
                 cell.setCellValue(editString(inOutWarehouseTask1.getInOutTaskNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(6);
+                cell = rowx.createCell(9);
                 cell.setCellValue(editDouble(inOutWarehouseTask1.getCompletedQuantity()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(7);
+                cell = rowx.createCell(10);
                 cell.setCellValue(editString(inOutWarehouseTask1.getWarehouseName()));
                 cell.setCellStyle(styleDetail);
                 rownum++;

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/InOutWarehouseTaskMapper.xml

@@ -206,6 +206,8 @@
             iowt.in_out_task_no AS inOutTaskNo,
             iowt.warehouse_name AS warehouseName,
             iowt.completed_quantity AS completedQuantity,
+        c.weight as contractWeight,
+        c.unit_contract_price as contractPrice,
         (
         SELECT
         IFNULL( sum( ei.amount_money ), 0 )
@@ -243,6 +245,32 @@
         AND ei.comp_id = iowt.comp_id
         AND ei.expenses_type = '1'
         AND ei.expenses_purpose = '1'
+        AND ei.cost_type = '3'
+        AND ( ei.STATUS = '已收款' OR ei.STATUS = '已完成' )) -
+        (
+        SELECT
+        IFNULL( sum( ei.amount_money ), 0 )
+        FROM
+        expense_info ei
+        WHERE
+        ei.delete_flag = '0'
+        AND ei.contract_no = iowt.contract_no
+        AND ei.comp_id = iowt.comp_id
+        AND ei.expenses_type = '2'
+        AND ei.expenses_purpose = '1'
+        AND ei.cost_type = '3'
+        AND ( ei.STATUS = '已付款' OR ei.STATUS = '已完成' ))AS nonGrainCollection,
+        (
+        SELECT
+        IFNULL( sum( ei.amount_money ), 0 )
+        FROM
+        expense_info ei
+        WHERE
+        ei.delete_flag = '0'
+        AND ei.contract_no = iowt.contract_no
+        AND ei.comp_id = iowt.comp_id
+        AND ei.expenses_type = '1'
+        AND ei.expenses_purpose = '1'
         AND ei.cost_type = '5'
         AND ( ei.STATUS = '已收款' OR ei.STATUS = '已完成' )) -
         (
@@ -295,6 +323,7 @@
         AND ( ei.STATUS = '已付款' OR ei.STATUS = '已完成' ))AS uncollectedPayment
         FROM
             in_out_warehouse_task iowt
+        LEFT JOIN contract_management_info c on c.contract_no=iowt.contract_no and c.comp_id=iowt.comp_id and c.delete_flag=0
         WHERE
             iowt.delete_flag = 0
           AND iowt.comp_id = #{compId}