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

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PerformanceInformationController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 绩效信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-12-11
+ */
+@RestController
+@RequestMapping("/performanceInformation")
+public class PerformanceInformationController {
+
+}
+

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WeighingManagementController.java

@@ -2,8 +2,13 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.winsea.svc.base.base.entity.CommonCompany;
+import com.winsea.svc.base.base.service.ICommonCompanyService;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
+import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
 import com.yh.saas.plugin.yiliangyiyun.service.IWeighingManagementService;
+import com.yh.saas.plugin.yiliangyiyun.util.QRCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +26,10 @@ public class WeighingManagementController {
 
     @Autowired
     private IWeighingManagementService weighingManagementService;
-
+    @Autowired
+    private ICommonCompanyService companyService;
+    @Autowired
+    private QRCodeUtil qrCodeUtil ;
     /**
      * 检斤管理列表
      * @param weighingManagement
@@ -88,5 +96,27 @@ public class WeighingManagementController {
         return weighingManagementService.getWeighingManagement(id);
     }
 
+    /**
+     * 获取二维码
+     * @param weighingManagement
+     * @return
+     */
+    @GetMapping("/generateQRCodeImage")
+    public String generateQRCodeImage(WeighingManagement weighingManagement) {
+        weighingManagement.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+        CommonCompany commonCompany = companyService.selectById(weighingManagement.getCompId());
+        return qrCodeUtil.generateQRCodeImage(weighingManagement.getPrintString(),800,800,"company",weighingManagement.getCompId());
+    }
+
+    /**
+     * 扫描二维码
+     * @param weighingManagement
+     * @return
+     */
+    @GetMapping("/getQRcode")
+    public WeighingManagement getQRcode(WeighingManagement weighingManagement) {
+        return weighingManagementService.getQRcode(weighingManagement);
+    }
+
 }
 

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

@@ -114,6 +114,11 @@ public class AcquisitionInfo extends BaseModel<AcquisitionInfo> {
      */
     @TableField(exist = false)
     private String searchKeyWord;
+    /**
+     * 仓库id
+     */
+    @TableField(exist = false)
+    private String warehouseId;
 
     @Override
     protected Serializable pkVal() {

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

@@ -162,6 +162,16 @@ public class IdentityAuthenticationInfo extends BaseModel<IdentityAuthentication
 
     @TableField(exist = false)
     private DriverPayeeInfo driverPayeeInfo;
+    /**
+     * 仓库id
+     */
+    @TableField(exist = false)
+    private String warehouseId;
+    /**
+     * 货名
+     */
+    @TableField(exist = false)
+    private String goodsName;
 
 
     @Override

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

@@ -0,0 +1,96 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 绩效信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-12-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("performance_information")
+public class PerformanceInformation extends BaseModel<PerformanceInformation> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 运输类型（1汽运2火运3散船4集装箱船）
+     */
+    private String tranType;
+    /**
+     * 类型
+     */
+    private String type;
+    /**
+     * 重量（吨）
+     */
+    private Float weight;
+    /**
+     * 发货地省
+     */
+    private String sendPrivate;
+    /**
+     * 发货地市
+     */
+    private String sendCity;
+    /**
+     * 发货地区
+     */
+    private String sendArea;
+    /**
+     * 发货地详细地址
+     */
+    private String sendDetailedAddress;
+    /**
+     * 收货地省
+     */
+    private String receivePrivate;
+    /**
+     * 收货地市
+     */
+    private String receiveCity;
+    /**
+     * 收货地区
+     */
+    private String receiveArea;
+    /**
+     * 收货地详细地址
+     */
+    private String receiveDetailedAddress;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -81,18 +81,22 @@ public class StockPurchaseReceiptReport extends BaseModel<StockPurchaseReceiptRe
      * 结算重量（吨）
      */
     private Float settlementWeight;
+    /**
+     * 结算单价（元/吨）
+     */
+    private Double settlementPrice;
     /**
      * 应付金额（元/吨）
      */
-    private Float amountIngPayable;
+    private Double amountIngPayable;
     /**
      * 已付金额（元/吨）
      */
-    private Float amountEdPayable;
+    private Double amountEdPayable;
     /**
      * 未付金额（元/吨）
      */
-    private Float amountNotPayable;
+    private Double amountNotPayable;
     /**
      * 扣款金额
      */
@@ -154,7 +158,7 @@ public class StockPurchaseReceiptReport extends BaseModel<StockPurchaseReceiptRe
      *付款金额
      */
     @TableField(exist = false)
-    private Float money;
+    private Double money;
 
     @TableField(exist = false)
     private String taskId;
@@ -178,6 +182,11 @@ public class StockPurchaseReceiptReport extends BaseModel<StockPurchaseReceiptRe
      */
     @TableField(exist = false)
     private String customer;
+    /**
+     * 修改重量1修改单价2
+     */
+    @TableField(exist = false)
+    private String flag;
 
     /**
      *补货结转对象

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

@@ -265,14 +265,23 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
     private String viewFlag;
     @TableField(exist = false)
     private String automaticWeightAcquisition;
-
+    @TableField(exist = false)
+    private String printString;
     /**
      *质检对象
      */
     @TableField(exist = false)
     private QualityInspectionManagement qualityInspectionManagement;
+    /**
+     *付款对象
+     */
     @TableField(exist = false)
     private PaymentManagement paymentManagement;
+    /**
+     *仓库对象
+     */
+    @TableField(exist = false)
+    private WarehouseBaseInfo warehouseBaseInfo;
 
     /**
      * 是否允许重新过皮重

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.PerformanceInformation;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 绩效信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-12-11
+ */
+public interface PerformanceInformationMapper extends BaseMapper<PerformanceInformation> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.PerformanceInformation;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 绩效信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-12-11
+ */
+public interface IPerformanceInformationService extends IService<PerformanceInformation> {
+
+}

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

@@ -50,7 +50,12 @@ public interface IWeighingManagementService extends IService<WeighingManagement>
      * @param id
      */
     WeighingManagement getWeighingManagement(String id);
-
+    /**
+     * 扫描二维码
+     * @param
+     * @return
+     */
+    WeighingManagement getQRcode(WeighingManagement weighingManagement);
 
 
 }

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

@@ -24,9 +24,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.Date;
 
 /**
  * <p>
@@ -44,6 +44,10 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
     private ICommonCompanyIdentityService iCommonCompanyIdentityService;
     @Autowired
     private ICustomerInfoService customerInfoService;
+    @Autowired
+    private IPurchasePriceService purchasePriceService;
+    @Autowired
+    private IPaymentManagementService paymentManagementService;
 
     /**
      * 粮商认证列表
@@ -494,6 +498,49 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                 .eq("cover","0")
                 .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
                 .eq("authentication_status_key","7"));
+        PurchasePrice purchasePrice=purchasePriceService.selectOne(new EntityWrapper<PurchasePrice>()
+                .eq("warehouse_id",identityAuthenticationInfo.getWarehouseId())
+                .eq("goods_name",identityAuthenticationInfo.getGoodsName())
+                .eq("status","已通过"));
+        List<IdentityAuthenticationInfo> identityAuthenticationInfoListNew=new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(identityAuthenticationInfoList)){
+            for (IdentityAuthenticationInfo identityAuthenticationInfo1:identityAuthenticationInfoList) {
+                Float cumulant = 0.0f;
+                //本年第一天零点
+                SimpleDateFormat now = new SimpleDateFormat("yyyy-01-01 00:00:00");
+                Calendar c = Calendar.getInstance();
+                c.setTime(new java.util.Date());
+                c.add(Calendar.YEAR, 0);
+                Date y = c.getTime();
+                String year = now.format(y);
+                if (identityAuthenticationInfo.getGoodsName().contains("玉米")) {
+                    identityAuthenticationInfo.setGoodsName("玉米");
+                }
+                List<PaymentManagement> paymentManagementList = paymentManagementService.selectList(new EntityWrapper<PaymentManagement>()
+                        .like("goods_name", "%" + identityAuthenticationInfo.getGoodsName() + "%")
+                        .eq("customer_number_card", identityAuthenticationInfo1.getCustomerNumberCard())
+                        .eq("comp_id", purchasePrice.getCompId())
+                        .ge("create_date", year));
+                if (!CollectionUtils.isEmpty(paymentManagementList)) {
+                    Float netWeight = 0f;
+                    for (PaymentManagement paymentManagement1 : paymentManagementList) {
+                        //干粮净重
+                        if ("干粮".equals(paymentManagement1.getType())) {
+                            netWeight = netWeight + (paymentManagement1.getNetWeight() != null ? paymentManagement1.getNetWeight() : 0f);
+                        }
+                        //潮粮纯重
+                        else if ("潮粮".equals(paymentManagement1.getType())) {
+                            netWeight = netWeight + (paymentManagement1.getPureWeight() != null ? paymentManagement1.getPureWeight() : 0f);
+                        }
+                    }
+                    cumulant = cumulant + netWeight;
+                }
+                if (cumulant > (purchasePrice.getSaleLimit() - 50)*1000) {
+                    identityAuthenticationInfoListNew.add(identityAuthenticationInfo1);
+                }
+            }
+            identityAuthenticationInfoList.removeAll(identityAuthenticationInfoListNew);
+        }
         return identityAuthenticationInfoList;
     }
 }

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

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.PerformanceInformation;
+import com.yh.saas.plugin.yiliangyiyun.mapper.PerformanceInformationMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IPerformanceInformationService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 绩效信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-12-11
+ */
+@Service
+public class PerformanceInformationServiceImpl extends ServiceImpl<PerformanceInformationMapper, PerformanceInformation> implements IPerformanceInformationService {
+
+}

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

@@ -126,6 +126,13 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
                 qualityInspectionManagement.setPerson(warehouseBaseInfo.getPersonCharge());
                 qualityInspectionManagement.setPersonPhone(warehouseBaseInfo.getPersonPhone());
             }
+            //检斤信息
+            WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
+                    .eq("relation_id", qualityInspectionManagement.getRelationId())
+                    .eq("comp_id", qualityInspectionManagement.getCompId()));
+            if (weighingManagement!=null) {
+                qualityInspectionManagement.setWeighingManagement(weighingManagement);
+            }
         }
         return qualityInspectionManagement;
     }

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

@@ -149,7 +149,16 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
         //查询采购入库报表
         StockPurchaseReceiptReport stockPurchaseReceiptReport1 = this.selectById(stockPurchaseReceiptReport.getId());
         if (stockPurchaseReceiptReport1 != null) {
-            stockPurchaseReceiptReport1.setSettlementWeight(stockPurchaseReceiptReport.getSettlementWeight());
+            if ("1".equals(stockPurchaseReceiptReport.getFlag())) {
+                stockPurchaseReceiptReport1.setSettlementWeight(stockPurchaseReceiptReport.getSettlementWeight());
+                stockPurchaseReceiptReport1.setAmountIngPayable(stockPurchaseReceiptReport.getSettlementWeight() * stockPurchaseReceiptReport1.getSettlementPrice());
+                stockPurchaseReceiptReport1.setAmountNotPayable(stockPurchaseReceiptReport1.getAmountIngPayable() - stockPurchaseReceiptReport1.getAmountEdPayable());
+            }
+            else{
+                stockPurchaseReceiptReport1.setSettlementPrice(stockPurchaseReceiptReport.getSettlementPrice());
+                stockPurchaseReceiptReport1.setAmountIngPayable(stockPurchaseReceiptReport1.getSettlementWeight() * stockPurchaseReceiptReport.getSettlementPrice());
+                stockPurchaseReceiptReport1.setAmountNotPayable(stockPurchaseReceiptReport1.getAmountIngPayable() - stockPurchaseReceiptReport1.getAmountEdPayable());
+            }
             //更改采购入库报表信息
             this.updateById(stockPurchaseReceiptReport1);
             return "OK";
@@ -165,7 +174,7 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
     @Transactional(rollbackFor = Exception.class)
     public String payMoney(StockPurchaseReceiptReport stockPurchaseReceiptReport) {
         List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = stockPurchaseReceiptReport.getStockPurchaseReceiptReportList();
-        Float money = stockPurchaseReceiptReport.getMoney();
+        Double money = stockPurchaseReceiptReport.getMoney();
         //付款多条
         if (!CollectionUtils.isEmpty(stockPurchaseReceiptReportList)) {
             for (StockPurchaseReceiptReport stockPurchaseReceiptReport1 : stockPurchaseReceiptReportList) {
@@ -179,10 +188,10 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                     stockPurchaseReceiptReport1.setPaymentDate(stockPurchaseReceiptReport.getPaymentDate());
                     stockPurchaseReceiptReport1.setPaymentScreenshot(stockPurchaseReceiptReport2.getPaymentScreenshot() != null ? stockPurchaseReceiptReport2.getPaymentScreenshot() + '$' + stockPurchaseReceiptReport.getPaymentScreenshot() : stockPurchaseReceiptReport.getPaymentScreenshot());
                     stockPurchaseReceiptReport1.setAmountEdPayable(stockPurchaseReceiptReport1.getAmountEdPayable() + stockPurchaseReceiptReport1.getAmountNotPayable());
-                    stockPurchaseReceiptReport1.setAmountNotPayable(0.0f);
+                    stockPurchaseReceiptReport1.setAmountNotPayable(0.0d);
                     this.updateById(stockPurchaseReceiptReport1);
                 } else if (money > 0) {
-                    Float moneyTmp = money - stockPurchaseReceiptReport1.getAmountNotPayable();
+                    Double moneyTmp = money - stockPurchaseReceiptReport1.getAmountNotPayable();
                     //部分付款
                     stockPurchaseReceiptReport1.setStatus(StatusEnum.PUR_PAY.getName());
                     stockPurchaseReceiptReport1.setStatusFlag(StatusEnum.PUR_PAY.getFlag());
@@ -217,7 +226,7 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
             ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                     .eq("contract_id",contractManagementInfo.getId()));
             contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
-            Float money = 0.0f;
+            Double money = 0.0d;
             //查现货采购入库报表
             List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = this.selectList(new EntityWrapper<StockPurchaseReceiptReport>()
                     .eq("contract_no", contractManagementInfo.getContractNo())

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

@@ -872,8 +872,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 contractManagementInfo.setInOutType("采购入库");
-                //期货取点价，现货取单价
-                contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
+                if (contractManagementInfo.getUnitContractPrice()!=null) {
+                    //期货取点价，现货取单价
+                    contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
+                }
                 temp.add(contractManagementInfo);
             }
             List<InOutWarehouseTask> inOutWarehouseTaskList = iInOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
@@ -967,8 +969,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
                 contractManagementInfo.setInOutType("采购入库");
-                //期货取点价，现货取单价
-                contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
+                if (contractManagementInfo.getUnitContractPrice()!=null) {
+                    //期货取点价，现货取单价
+                    contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
+                }
                 temp.add(contractManagementInfo);
             }
             List<ContractManagementInfo> contractManagementInfoList1 = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()

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

@@ -670,10 +670,17 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
                             stockPurchaseReceiptReport.setDeductionWeight(warehouseInOutInfo.getDeductionWeight());
                             stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-
-                            stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
-                                    (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())) - Float.valueOf(warehouseInOutInfo.getDeductionAmount())));
-                            stockPurchaseReceiptReport.setAmountEdPayable(0.0f);
+                            stockPurchaseReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
+                            if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
+                                        (contractManagementInfo.getUnitContractPrice() - Float.valueOf(warehouseInOutInfo.getDeductionAmount())));
+                            }
+                            //随行就市
+                            else {
+                                stockPurchaseReceiptReport.setAmountIngPayable(Double.valueOf(warehouseInOutInfo.getNetWeight() *
+                                        (warehouseInOutInfo.getCost() - Float.valueOf(warehouseInOutInfo.getDeductionAmount()))));
+                            }
+                            stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                             stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());
                             stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                             stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
@@ -743,10 +750,17 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
                                     stockPurchaseReceiptReport.setDeductionWeight(warehouseInOutInfo.getDeductionWeight());
                                     stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-
-                                    stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
-                                            (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())) - Float.valueOf(warehouseInOutInfo.getDeductionAmount())));
-                                    stockPurchaseReceiptReport.setAmountEdPayable(0.0f);
+                                    stockPurchaseReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
+                                    if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                        stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
+                                                (contractManagementInfo.getUnitContractPrice() - Float.valueOf(warehouseInOutInfo.getDeductionAmount())));
+                                    }
+                                    //随行就市
+                                    else {
+                                        stockPurchaseReceiptReport.setAmountIngPayable(Double.valueOf(warehouseInOutInfo.getNetWeight() *
+                                                (warehouseInOutInfo.getCost() - Float.valueOf(warehouseInOutInfo.getDeductionAmount()))));
+                                    }
+                                    stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                                     stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());
                                     stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                                     stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
@@ -1189,9 +1203,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
                             stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-                            stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
-                                    (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
-                            stockPurchaseReceiptReport.setAmountEdPayable(0.0f);
+                            stockPurchaseReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
+                            if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
+                                        (contractManagementInfo.getUnitContractPrice()));
+                            }
+                            //随行就市
+                            else {
+                                stockPurchaseReceiptReport.setAmountIngPayable(Double.valueOf(warehouseInOutInfo.getNetWeight() * warehouseInOutInfo.getCost()));
+                            }
+                            stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                             stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());
                             stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                             stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());

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

@@ -15,6 +15,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WeighingManagementMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.util.QRCodeUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,6 +51,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
     private IContractManagementInfoService contractManagementInfoService;
     @Autowired
     private ICommonStaffService staffService;
+    @Autowired
+    private QRCodeUtil qrCodeUtil;
     /**
      * 检斤管理列表
      * @param weighingManagement
@@ -390,4 +393,36 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         }
     }
 
+    /**
+     * 扫描二维码
+     * @param
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public WeighingManagement getQRcode(WeighingManagement weighingManagement) {
+        //查询检斤信息
+        WeighingManagement weighingManagement1 = this.selectOne(new EntityWrapper<WeighingManagement>()
+            .eq("comp_id",weighingManagement.getCompId())
+            .eq("number",weighingManagement.getNumber())
+            .eq("delete_flag","0"));
+        //查询质检信息
+        QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                .eq("comp_id",weighingManagement.getCompId())
+                .eq("quality_no",weighingManagement.getNumber())
+                .eq("delete_flag","0"));
+        weighingManagement1.setQualityInspectionManagement(qualityInspectionManagement);
+        //查询付款信息
+        PaymentManagement paymentManagement = paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
+                .eq("comp_id",weighingManagement.getCompId())
+                .eq("payment_no",weighingManagement.getNumber())
+                .eq("delete_flag","0"));
+        weighingManagement1.setPaymentManagement(paymentManagement);
+        //查询仓库信息
+        WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                .eq("id",weighingManagement.getWarehouseId())
+                .eq("delete_flag","0"));
+        weighingManagement1.setWarehouseBaseInfo(warehouseBaseInfo);
+        return weighingManagement1;
+    }
 }

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

@@ -16,6 +16,7 @@
         a.update_date as updateDate,
         a.status,
         case when f.id is null then '未关注' else '已关注' end as follow,
+        w.id as warehouseId,
         w.warehouse_private as warehousePrivate,
         w.warehouse_city as warehouseCity,
         w.warehouse_area as warehouseArea,

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.PerformanceInformationMapper">
+
+</mapper>

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

@@ -52,6 +52,7 @@
         tare as tare,
         deduction_weight AS deductionWeight,
         settlement_weight AS settlementWeight,
+        settlement_price AS settlementPrice,
         amount_ing_payable as amountIngPayable,
         amount_ed_payable as amountEdPayable,
         amount_not_payable as amountNotPayable,