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/WarehouseInOutInfo.java

@@ -372,20 +372,6 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
     private ContractManagementInfo contractManagementInfo;
     @TableField(exist = false)
     private List<WarehouseInOutInfo> warehouseInOutInfoList;
-    /**
-     *质检对象
-     */
-    @TableField(exist = false)
-    private QualityInspectionManagement qualityInspectionManagement;
-    /**
-     *检斤对象
-     */
-    @TableField(exist = false)
-    private WeighingManagement weighingManagement;
-    @TableField(exist = false)
-    private PaymentManagement paymentManagement;
-    @TableField(exist = false)
-    private IdentityAuthenticationInfo identityAuthenticationInfo;
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -1398,55 +1398,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     public WarehouseInOutInfo getInfo(String id) {
         // 主表信息
         WarehouseInOutInfo warehouseInOutInfo = this.selectById(id);
-        //付款信息
-        PaymentManagement paymentManagement = paymentManagementService.selectById(warehouseInOutInfo.getPaymentId());
-        //质检信息
-        QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                .eq("relation_id", paymentManagement.getRelationId())
-                .eq("comp_id", paymentManagement.getCompId()));
-        //检斤信息
-        WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                .eq("relation_id", paymentManagement.getRelationId())
-                .eq("comp_id", paymentManagement.getCompId()));
-        PurchasePrice purchasePrice = purchasePriceService.selectOne(new EntityWrapper<PurchasePrice>()
-                .eq("warehouse_name", qualityInspectionManagement.getWarehouseName())
-                .eq("goods_name", qualityInspectionManagement.getGoodsName())
-                .eq("status_flag", "3"));
-        if (purchasePrice != null) {
-            if (purchasePrice.getParamType().equals("1")) {
-                PurchasePriceDetail purchasePriceDetail = purchasePriceDetailService.selectOne(new EntityWrapper<PurchasePriceDetail>()
-                        .eq("main_id", purchasePrice.getId())
-                        .like("level", qualityInspectionManagement.getGrade().replace("品", ""))
-                        .eq("delete_flag", "0"));
-                String[] point = purchasePriceDetail.getPoint().split(",");
-                String[] pointPrice = purchasePriceDetail.getPointPrice().split(",");
-                Float param = 0f;
-                for (int i = 0; i < point.length - 1; i++) {
-                    if (Float.parseFloat(qualityInspectionManagement.getWaterContent()) >= Float.parseFloat(point[i])
-                            && Float.parseFloat(qualityInspectionManagement.getWaterContent()) < Float.parseFloat(point[i + 1])) {
-                        param += (Float.parseFloat(qualityInspectionManagement.getWaterContent()) - Float.parseFloat(point[i])) * Float.parseFloat(pointPrice[i]);
-                        break;
-                    } else {
-                        param += (Float.parseFloat(point[i + 1]) - Float.parseFloat(point[i])) * Float.parseFloat(pointPrice[i]);
-                    }
-                }
-                param += qualityInspectionManagement.getBuckleMiscellaneous();
-                DecimalFormat df = new DecimalFormat("#.00");
-                param = Float.parseFloat(df.format(param));
-                warehouseInOutInfo.setWeightDeduction(param);
-            } else {
-                warehouseInOutInfo.setWeightDeduction(weighingManagement.getBuckleMiscellaneous());
-            }
-            qualityInspectionManagement.setWaterMin(purchasePrice.getWaterMin());
-        }
-        IdentityAuthenticationInfo identityAuthenticationInfo = iIdentityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
-                .eq("customer_name", paymentManagement.getCustomerName())
-                .eq("customer_phone", paymentManagement.getCustomerPhone())
-                .eq("customer_type_flag", "1"));
-        warehouseInOutInfo.setPaymentManagement(paymentManagement);
-        warehouseInOutInfo.setIdentityAuthenticationInfo(identityAuthenticationInfo);
-        warehouseInOutInfo.setQualityInspectionManagement(qualityInspectionManagement);
-        warehouseInOutInfo.setWeighingManagement(weighingManagement);
         //详情信息
         WarehouseInOutDetail warehouseInOutDetail = warehouseInOutDetailService.selectOne(new EntityWrapper<WarehouseInOutDetail>().eq(WarehouseInOutDetail.QueryFiles.INFO_ID, id));
         if (warehouseInOutDetail != null) {

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

@@ -71,6 +71,7 @@
         w.skin_inspector as skinInspector,
         w.start_weight as startWeight,
         w.address_url as addressUrl,
+        w.payment_id as paymentId,
         w.task_type as taskType,
         w.bin_number as binNumber,
         w.type,