销售收入上缴-v1.1

src/main/java/com/chinaitop/depot/intelligent/priceApproval/controller/BusinessFsSaleRevenueController.java

@@ -54,11 +54,17 @@ public class BusinessFsSaleRevenueController {
     }
 
     @GetMapping("/getOutStorageInfo/{contractNumber}")
-    @ApiOperation(value = "三账一致性-实际出库情况*", notes = "实际出库情况")
+    @ApiOperation(value = "三账一致性-实际出库情况", notes = "实际出库情况")
     public ResponseEntity<List<BusinessFsSaleRevenueThreeConsistence>> getOutStorageInfo(@PathVariable("contractNumber") String contractNumber) {
         return ResponseEntity.ok(saleRevenueService.getOutStorageInfo(contractNumber));
     }
 
+    @GetMapping("/getOutStorageDetailed/{contractNumber}")
+    @ApiOperation(value = "三账一致性-出库明细", notes = "出库明细")
+    public ResponseEntity<List<DataCPZ>> getOutStorageDetailed(@PathVariable("contractNumber") String contractNumber) {
+        return ResponseEntity.ok(saleRevenueService.getOutStorageDetailed(contractNumber));
+    }
+
     @PostMapping("/save")
     @ApiOperation(value = "销售收入上缴新增*", notes = "新增")
     public ResponseEntity save(@Validated @RequestBody BusinessFsSaleRevenue param) {

src/main/java/com/chinaitop/depot/intelligent/priceApproval/mapper/BusinessFsSaleRevenueMapper.java

@@ -24,4 +24,8 @@ public interface BusinessFsSaleRevenueMapper extends BaseMapper<BusinessFsSaleRe
     List<BusinessFsSaleRevenueInspectionLoss> getQualityInfo(Map<String, Object> map);
 
     List<BusinessFsSaleRevenueThreeConsistence> getConsistenceAccountInfo(@Param("contractNumber") String contractNumber);
+
+    List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(@Param("contractNumber") String contractNumber);
+
+    List<DataCPZ> getOutStorageDetailed(@Param("contractNumber") String contractNumber);
 }

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenueThreeConsistence.java

@@ -54,7 +54,7 @@ public class BusinessFsSaleRevenueThreeConsistence implements Serializable {
 
     @ApiModelProperty(value = "年")
     @TableField("year")
-    private Date year;
+    private Integer year;
 
     @ApiModelProperty(value = "月份")
     @TableField("month")

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/BusinessFsSaleRevenueService.java

@@ -26,4 +26,6 @@ public interface BusinessFsSaleRevenueService extends IService<BusinessFsSaleRev
     List<BusinessFsSaleRevenueThreeConsistence> getConsistenceAccountInfo(String contractNumber);
 
     List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(String contractNumber);
+
+    List<DataCPZ> getOutStorageDetailed(String contractNumber);
 }

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueServiceImpl.java

@@ -79,7 +79,12 @@ public class BusinessFsSaleRevenueServiceImpl extends ServiceImpl<BusinessFsSale
 
     @Override
     public List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(String contractNumber) {
-        return null;
+        return saleRevenueMapper.getOutStorageInfo(contractNumber);
+    }
+
+    @Override
+    public List<DataCPZ> getOutStorageDetailed(String contractNumber) {
+        return saleRevenueMapper.getOutStorageDetailed(contractNumber);
     }
 
     // 保存子表-质检损益信息

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueMapper.xml

@@ -151,4 +151,84 @@
         WHERE
             contract_number = #{contractNumber}
     </select>
+    <select id="getOutStorageInfo" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistence">
+        SELECT
+            YEAR (ci.createdate) `year`,
+            MONTH (ci.createdate) `month`,
+            ci.basic_storehouse_id basicStorehouseId,
+            ci.warehouse_id warehouseId,
+            bs.storehouse_name storehouseName,
+            bw.warehouse_name warehouseName,
+            IFNULL(lc.actual_loss_quantity, 0) loss,
+            IFNULL(cd.klhjz, 0) custodyAccountQuantity,
+            IFNULL(sa.expenditure_quantity, 0) statisticalAccountQuantity,
+            cd.djsj completeTime
+        FROM
+            business_fs_out_confirm oc
+        LEFT JOIN business_fs_out_confirm_contract_item ci ON ci.fs_out_confirm_id = oc.id
+        LEFT JOIN business_contract bc ON bc.id = oc.contract_id
+        LEFT JOIN basic_storehouse bs ON ci.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON ci.warehouse_id = bw.warehouse_id
+        LEFT JOIN (
+            SELECT
+                SUM(lcIn.actual_loss_quantity) actual_loss_quantity,
+                YEAR (lcIn.outbound_time) `year`,
+                MONTH (lcIn.outbound_time) `month`
+            FROM
+                business_gslr_loss_collect lcIn
+            GROUP BY
+                YEAR (lcIn.outbound_time),
+                MONTH (lcIn.outbound_time)
+        ) lc ON YEAR (ci.createdate) = lc. YEAR
+        AND MONTH (ci.createdate) = lc. MONTH
+        LEFT JOIN (
+            SELECT
+                cdIn.htbh,
+                cdIn2.klhjz,
+                cdIn2.sjhwh,
+                cdIn2.xldd,
+                cdIn.djsj,
+                YEAR (cdIn.djsj) `year`,
+                MONTH (cdIn.djsj) `month`
+            FROM
+                data_crkyw_ckrmdj_default cdIn
+            LEFT JOIN data_crkyw_ckcmz_default cdIn2 ON cdIn.BizNo = cdIn2.BizNo
+            GROUP BY
+                YEAR (cdIn.djsj),
+                MONTH (cdIn.djsj)
+        ) cd ON YEAR (ci.createdate) = cd. YEAR
+        AND MONTH (ci.createdate) = cd. MONTH
+        LEFT JOIN (
+            SELECT
+                SUM(saIn.expenditure_quantity) expenditure_quantity,
+                YEAR (saIn.statistical_date) `year`,
+                MONTH (saIn.statistical_date) `month`
+            FROM
+                business_fs_statistical_account saIn
+            LEFT JOIN business_contract bcIn ON saIn.contract_id = bcIn.id
+            GROUP BY
+                YEAR (saIn.statistical_date),
+                MONTH (saIn.statistical_date)
+        ) sa ON YEAR (ci.createdate) = sa. YEAR
+        AND MONTH (ci.createdate) = sa. MONTH
+        WHERE
+            bc.contract_number = #{contractNumber}
+    </select>
+    <select id="getOutStorageDetailed" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.DataCPZ">
+        SELECT
+            cdIn.htbh,
+            cdIn2.sjckchmc storehouseName,
+            cdIn2.sjhwhmc warehouseName,
+            cdIn2.qcph,
+            cdIn2.mz mzzl,
+            cdIn3.pz,
+            cdIn2.klhjz bzwkl,
+            cdIn.djsj cpzsj
+        FROM
+            data_crkyw_ckrmdj_default cdIn
+        LEFT JOIN data_crkyw_ckcmz_default cdIn2 ON cdIn.BizNo = cdIn2.BizNo
+        LEFT JOIN data_crkyw_ckcpz_default cdIn3 ON cdIn.BizNo = cdIn3.BizNo
+        WHERE
+            cdIn.htbh = #{contractNumber}
+    </select>
 </mapper>