更新

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

@@ -956,8 +956,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         }
         //查销售合同编号,以及移库任务编号
         else if (flag == 5) {
-            calendar = Calendar.getInstance();
-            calendar.add(Calendar.MONTH, -1);
+//            calendar = Calendar.getInstance();
+//            calendar.add(Calendar.MONTH, -1);
             List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
                     .eq("comp_id", compId)
                     .eq("delete_flag", "0")
@@ -1077,8 +1077,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         }
         //查采购合同编号(不包含自运）,以及移库任务编号
         else if (flag == 6) {
-            calendar = Calendar.getInstance();
-            calendar.add(Calendar.MONTH, -1);
+//            calendar = Calendar.getInstance();
+//            calendar.add(Calendar.MONTH, -1);
             List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
                     .eq("comp_id", compId)
                     .eq("delete_flag", "0")

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

@@ -141,7 +141,7 @@
         s.net_weight as netWeight,
         s.deduction_amount as unitDeduction,
         '' as pureWeightPrice,
-        case when w.goods_name like '%潮粮%' then w.pure_weight else w.net_weight*1000 end as pureWeight,
+        case when w.goods_name like '%潮粮%' then w.pure_weight*1000 else w.net_weight*1000 end as pureWeight,
         s.amount_ing_payable as amountIngPayable,
         s.amount_ed_payable as amountEdPayable,
         i.payee_name as payeeName,
@@ -213,7 +213,7 @@
         w.net_weight as netWeight,
         IFNULL(q.deduction_amount,0) as unitDeduction,
         '' as pureWeightPrice,
-        case when w.goods_name like '%潮粮%' then w.pure_weight else w.net_weight*1000 end as pureWeight,
+        case when w.goods_name like '%潮粮%' then w.pure_weight*1000 else w.net_weight*1000 end as pureWeight,
         -- ROUND(IFNULL(r.amount_ing_payable,(w.cost+IFNULL(t.tran_price,0))*t.load_net_weight),2) as amountIngPayable,
         case when cmi.settlement_weight_method = '1' then
         ROUND((w.cost-IFNULL(q.deduction_amount,0))*t.load_net_weight,2)
@@ -296,7 +296,7 @@
         w.net_weight as netWeight,
         '' as unitDeduction,
         '' as pureWeightPrice,
-        case when w.goods_name like '%潮粮%' then w.pure_weight else w.net_weight*1000 end as pureWeight,
+        case when w.goods_name like '%潮粮%' then w.pure_weight*1000 else w.net_weight*1000 end as pureWeight,
         0 as amountIngPayable,
         0 as amountEdPayable,
         '' as payeeName,