1

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

@@ -1571,7 +1571,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             //查询详细数据
             Map<String, Object> pageView1 = new HashMap<>();
             //  关联ID
-            pageView1.put("batchId", warehousingOrder1.getId());
+            pageView1.put("batchId", warehousingOrder1.getBatchId());
             // 查询付款数据
             List<PaymentManagement> dataList1 = baseMapper.getListByConditionOut(pageView1);
             if(!CollectionUtils.isEmpty(dataList1)){
@@ -1585,6 +1585,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder1.setImpurity(dataList1.get(j).getImpurity());
                     warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
                     warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
+                    warehousingOrder1.setWaterContent(dataList1.get(j).getWaterContent());
                     if("潮粮".contains(dataList1.get(j).getGoodsName())){
                         //单价=（潮粮单价-扣单价）*1000
                         warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice()-dataList1.get(j).getUnitDeduction())*1000);

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

@@ -65,6 +65,7 @@
         w.amount_not_payable as amountNotPayable,
         w.contract_no as contractNo,
         w.goods_name as goodsName,
+        w.car_no as carNo,
         w.request_funds as requestFunds,
         w.request_person as requestPerson,
         w.request_date as requestDate,