更新

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

@@ -453,6 +453,12 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private List<QualityInspectionManagement> qualityInspectionManagementList;
+
+    /**
+     * 导入用粮款字段
+     */
+    @TableField(exist = false)
+    private Double money;
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -542,10 +542,23 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             qualityInspectionManagement1.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
             qualityInspectionManagement1.setCarNumber(qualityInspectionManagement1.getCarNumber());
             qualityInspectionManagement1.setWarehouseName(qualityInspectionManagement.getWarehouseName());
-            qualityInspectionManagement1.setDryGrainPrice(qualityInspectionManagement1.getDryGrainPrice());
+            if(qualityInspectionManagement1.getDryGrainPrice() == null && qualityInspectionManagement1.getMoney() != null){
+                Double price = (double)Math.round((qualityInspectionManagement1.getMoney()/qualityInspectionManagement1.getNetWeight())*1000)/1000;
+                qualityInspectionManagement1.setTidalGrainPrice(price);
+                qualityInspectionManagement1.setDryGrainPrice(price);
+            }
+            else{
+                qualityInspectionManagement1.setTidalGrainPrice(qualityInspectionManagement1.getDryGrainPrice());
+                qualityInspectionManagement1.setDryGrainPrice(qualityInspectionManagement1.getDryGrainPrice());
+            }
             qualityInspectionManagement1.setQualityDate(qualityInspectionManagement1.getQualityDate());
             qualityInspectionManagement1.setManagementType("1");
-            qualityInspectionManagement1.setType("干粮");
+            if(qualityInspectionManagement1.getGoodsName()!= null && qualityInspectionManagement1.getGoodsName().contains("潮粮")) {
+                qualityInspectionManagement1.setType("干粮");
+            }
+            else{
+                qualityInspectionManagement1.setType("潮粮");
+            }
             qualityInspectionManagement1.setBuckleWeightRatio(1.3f);
             qualityInspectionManagement1.setBinNumber("1");
             qualityInspectionManagement1.setConfirm("1");
@@ -576,7 +589,12 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             }else {
                 weighingManagement.setGoodsName("玉米");
             }
-            weighingManagement.setType("干粮");
+            if(qualityInspectionManagement1.getGoodsName()!= null && qualityInspectionManagement1.getGoodsName().contains("潮粮")) {
+                weighingManagement.setType("干粮");
+            }
+            else{
+                weighingManagement.setType("潮粮");
+            }
             weighingManagement.setBinNumber("1");
             weighingManagement.setSecretaryWeigher(commonStaff.getStaffName());
             weighingManagement.setSkinInspector(commonStaff.getStaffName());
@@ -608,7 +626,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
                 paymentManagement.setGoodsName("玉米");
             }
             paymentManagement.setType("干粮");
-            paymentManagement.setTidalGrainPrice(qualityInspectionManagement1.getDryGrainPrice());
+            paymentManagement.setSolidGrainPrice(qualityInspectionManagement1.getDryGrainPrice());
             paymentManagement.setTidalGrainPrice(qualityInspectionManagement1.getDryGrainPrice());
             paymentManagement.setStatus("全部付款");
             paymentManagement.setStatusFlag("5");
@@ -623,6 +641,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             Double money = (qualityInspectionManagement1.getDryGrainPrice()-paymentManagement.getUnitDeduction()) * qualityInspectionManagement1.getNetWeight();
 //            BigDecimal money1 = new BigDecimal(money);
 //            Double money2 = money1.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+            if(qualityInspectionManagement1.getMoney() != null){
+                money = qualityInspectionManagement1.getMoney();
+            }
             paymentManagement.setAmountIngPayable(money);
             paymentManagement.setAmountEdPayable(money);
             paymentManagement.setGrainMoney(Float.valueOf(String.valueOf(money)));

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

@@ -479,6 +479,10 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     weighingManagement.setShipName(warehouseInOutInfo.getShipName());
                     weighingManagement.setShipNumber(warehouseInOutInfo.getShipNumber());
                     weighingManagement.setFireDirection(warehouseInOutInfo.getFireDirection());
+                    weighingManagement.setBoxNo(warehouseInOutInfo.getBoxNo());
+                    weighingManagement.setBoxNoOther(warehouseInOutInfo.getBoxNoOther());
+                    weighingManagement.setTitleNo(warehouseInOutInfo.getTitleNo());
+                    weighingManagement.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                 }
             }
             CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()

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

@@ -82,9 +82,14 @@
         a.address_url as addressUrl,
         a.net_weight as netWeight,
         a.status_flag as statusFlag,
+        wioi.box_no as boxNo,
+        wioi.box_no_other as boxNoOther,
+        wioi.title_no as titleNo,
+        wioi.title_no_other as titleNoOther,
         case when p.id is null then 1 when p.status !='待结算' or p.approve_status is null then 2 else 1 end as allow
         FROM weighing_management a
         left join payment_management p on p.relation_id = a.relation_id and p.comp_id = a.comp_id and p.delete_flag = 0
+        left join warehouse_in_out_info wioi on wioi.id = a.warehouse_in_out_id and wioi.delete_flag = 0
         left join contract_management_info cm on cm.contract_no = a.contract_no and cm.comp_id = a.comp_id and cm.delete_flag = 0
         left join tran_task_info tti on tti.contract_no = a.contract_no and tti.delete_flag = 0 and tti.comp_id = a.comp_id
         left join contract_management_info cm1 on cm1.contract_no = tti.send_warehouse and cm1.comp_id = a.comp_id and cm1.delete_flag = 0