Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -390,6 +390,61 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      */
     @TableField(exist = false)
     private String bankDepositBranch;
+    /**
+     * 净重（吨）
+     */
+    @TableField(exist = false)
+    private Float netWeight;
+    /**
+     * 毛重（吨）
+     */
+    @TableField(exist = false)
+    private Float grossWeight;
+    /**
+     * 皮重（吨）
+     */
+    @TableField(exist = false)
+    private Float tare;
+    /**
+     * 等级
+     */
+    @TableField(exist = false)
+    private String grade;
+    /**
+     * 容重
+     */
+    @TableField(exist = false)
+    private String bulkDensity;
+    /**
+     * 水分
+     */
+    @TableField(exist = false)
+    private String waterContent;
+    /**
+     * 霉变粒
+     */
+    @TableField(exist = false)
+    private String mildewGrain;
+    /**
+     * 杂质
+     */
+    @TableField(exist = false)
+    private String impurity;
+    /**
+     * 不完善粒
+     */
+    @TableField(exist = false)
+    private String imperfectGrain;
+    /**
+     * 热损伤
+     */
+    @TableField(exist = false)
+    private String jiaorenli;
+    /**
+     * 单价（元/吨）
+     */
+    @TableField(exist = false)
+    private Double price;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WarehousingOrderMapper.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
@@ -87,5 +88,12 @@ public interface WarehousingOrderMapper extends BaseMapper<WarehousingOrder> {
      * @return
      */
     List<WarehousingOrder> getGoodCostListByCondition(Map<String, Object> pageView);
+    /**
+     * 根据条件查询付款列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<PaymentManagement> getListByConditionOut(Map<String, Object> pageView);
 
 }

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

@@ -511,6 +511,11 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         return count;
     }
 
+    /**
+     * 导入
+     * @param qualityInspectionManagement
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String importQuality(QualityInspectionManagement qualityInspectionManagement) {
@@ -520,7 +525,11 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             qualityInspectionManagement1.setId(IdGenerator.generateUUID());
             qualityInspectionManagement1.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
             qualityInspectionManagement1.setRelationId(relationId);
-            qualityInspectionManagement1.setGoodsName("玉米");
+            if(qualityInspectionManagement1.getGoodsName() != null){
+                qualityInspectionManagement1.setGoodsName(qualityInspectionManagement1.getGoodsName());
+            }else {
+                qualityInspectionManagement1.setGoodsName("玉米");
+            }
             qualityInspectionManagement1.setNatureOfGrainPurchase("贸易粮");
             qualityInspectionManagement1.setServiceManagementType("3");
             qualityInspectionManagement1.setQualityNo(qualityInspectionManagement1.getQualityNo());
@@ -554,7 +563,11 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             weighingManagement.setCarNumber(qualityInspectionManagement1.getCarNumber());
             weighingManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
             weighingManagement.setServiceManagementType("3");
-            weighingManagement.setGoodsName("玉米");
+            if(qualityInspectionManagement1.getGoodsName() != null){
+                weighingManagement.setGoodsName(qualityInspectionManagement1.getGoodsName());
+            }else {
+                weighingManagement.setGoodsName("玉米");
+            }
             weighingManagement.setType("干粮");
             weighingManagement.setBinNumber("1");
             weighingManagement.setSecretaryWeigher(commonStaff.getStaffName());
@@ -578,7 +591,11 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             paymentManagement.setCustomerName(qualityInspectionManagement1.getCustomerName());
             paymentManagement.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
             paymentManagement.setCarNo(qualityInspectionManagement1.getCarNumber());
-            paymentManagement.setGoodsName("玉米");
+            if(qualityInspectionManagement1.getGoodsName() != null){
+                paymentManagement.setGoodsName(qualityInspectionManagement1.getGoodsName());
+            }else {
+                paymentManagement.setGoodsName("玉米");
+            }
             paymentManagement.setType("干粮");
             paymentManagement.setTidalGrainPrice(qualityInspectionManagement1.getDryGrainPrice());
             paymentManagement.setTidalGrainPrice(qualityInspectionManagement1.getDryGrainPrice());

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

@@ -19,6 +19,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
+import com.yh.saas.plugin.yiliangyiyun.mapper.PaymentManagementMapper;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WarehousingOrderMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
@@ -1555,6 +1556,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         Map<String, Object> pageView = new HashMap<>();
         pageView.put("businessKeys", businessKeys);
         pageView.put("batchId", warehousingOrder.getBatchId());
+        pageView.put("compId", warehousingOrder.getCompId());
         pageView.put("appFlag", "1");
         // 查询入库单总数
         List<WarehousingOrder> dataList = baseMapper.getListByCondition(pageView);
@@ -1566,6 +1568,31 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             //请款累计和
             requestFundsTotal = requestFundsTotal + warehousingOrder1.getRequestFunds();
             inWarehouseWeightTotal=inWarehouseWeightTotal+warehousingOrder1.getInWarehouseWeight();
+            //查询详细数据
+            Map<String, Object> pageView1 = new HashMap<>();
+            //  关联ID
+            pageView1.put("batchId", warehousingOrder1.getId());
+            // 查询付款数据
+            List<PaymentManagement> dataList1 = baseMapper.getListByConditionOut(pageView1);
+            if(!CollectionUtils.isEmpty(dataList1)){
+                for (int j = 0; j < dataList1.size(); j++){
+                    warehousingOrder1.setNetWeight(dataList1.get(j).getNetWeight()/1000);
+                    warehousingOrder1.setGrossWeight(dataList1.get(j).getGrossWeight()/1000);
+                    warehousingOrder1.setTare(dataList1.get(j).getTare()/1000);
+                    warehousingOrder1.setGrade(dataList1.get(j).getGrade());
+                    warehousingOrder1.setBulkDensity(dataList1.get(j).getBulkDensity());
+                    warehousingOrder1.setMildewGrain(dataList1.get(j).getMildewGrain());
+                    warehousingOrder1.setImpurity(dataList1.get(j).getImpurity());
+                    warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
+                    warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
+                    if("潮粮".contains(dataList1.get(j).getGoodsName())){
+                        //单价=（潮粮单价-扣单价）*1000
+                        warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice()-dataList1.get(j).getUnitDeduction())*1000);
+                    }else {
+                        warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice()-dataList1.get(j).getUnitDeduction())*1000);
+                    }
+                }
+            }
         }
 
         // 返回数据

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

@@ -414,4 +414,67 @@
           and wio.in_out_date> #{beforeDay}
         group BY wio.in_out_task_no
     </select>
+
+    <!-- 获得导出列表 -->
+    <select id="getListByConditionOut" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement">
+        SELECT
+        a.id,
+        a.comp_id as compId,
+        a.warehouse_name as warehouseName,
+        a.create_date as createDate,
+        a.payment_no as paymentNo,
+        a.customer_name as customerName,
+        a.customer_number_card as customerNumberCard,
+        a.workflow_id as workflowId,
+        q.bin_number as binNumber,
+        i.supplier,
+        q.quality_inspector as qualityInspector,
+        q.re_inspector as reInspector,
+        w.skin_inspector as skinInspector,
+        a.goods_name as goodsName,
+        a.type,
+        q.grade,
+        q.bulk_density as bulkDensity,
+        q.water_content as waterContent,
+        q.mildew_grain as mildewGrain,
+        q.impurity,
+        q.imperfect_grain as imperfectGrain,
+        q.jiaorenli,
+        a.car_no as carNo,
+        a.tidal_grain_price as tidalGrainPrice,
+        a.gross_weight as grossWeight,
+        a.tare,
+        a.weight_deduction as weightDeduction,
+        a.net_weight as netWeight,
+        a.unit_deduction as unitDeduction,
+        a.solid_grain_price as solidGrainPrice,
+        a.pure_weight as pureWeight,
+        a.amount_ing_payable as amountIngPayable,
+        a.amount_ed_payable as amountEdPayable,
+        a.update_date as updateDate,
+        i.bank_card as bankCard,
+        i.bank_deposit as bankDeposit,
+        i.bank_deposit_branch as bankDepositBranch
+        FROM payment_management a
+        left join quality_inspection_management q on q.relation_id = a.relation_id and q.comp_id = a.comp_id and q.delete_flag = 0
+        left join weighing_management w on w.relation_id = a.relation_id and w.comp_id = a.comp_id and w.delete_flag = 0
+        left join identity_authentication_info i on i.customer_name = a.customer_name and i.customer_number_card = a.customer_number_card
+        and i.customer_phone = a.customer_phone  and i.delete_flag = 0 and i.cover = 0
+        left join warehousing_order wo on wo.id = a.order_id and wo.delete_flag = 0
+        WHERE a.delete_flag = '0'
+        <if test="warehouseName != null and warehouseName != ''">
+            AND a.warehouse_name= #{warehouseName}
+        </if>
+        <if test="batchId != null and batchId != ''">
+            AND wo.batch_id= #{batchId}
+        </if>
+        <if test="businessKeys != null and businessKeys.size > 0">
+            and(
+            <foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
+                a.id = #{businessValue}
+            </foreach>
+            )
+        </if>
+    </select>
 </mapper>