diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java index 1053366e7..6b794530a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java @@ -138,4 +138,8 @@ public class PriceSheetVO { */ @Schema(description = "阶梯价计量单位") private String stairunit; + + @Schema(description = "金银价格") + private String au_ag_price; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml index c93026e4a..5b525e31f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml @@ -384,8 +384,8 @@ a.ca_id, a.oc_id, a.pps_id, - b.pps_code as psCode, - b.pps_name as psName, + b.pps_code as PS_CODE, + b.pps_name as PS_NAME, c.oc_code, c.oc_name, d.rework_code, diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java index b667e2ecf..b3b9f0fb3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java @@ -1563,106 +1563,106 @@ public class OemStatementServiceImpl extends BaseServiceImpl getPriceSheetsWithCondition(String oemName) { -// PriceSheetQuery query = new PriceSheetQuery(); -// query.setOcName(oemName); -// query.setValidflags(Arrays.asList("有效", "无效")); -// query.setPapertype("外协定价"); -// query.setPricetype("工序协作"); -// R> pageR = erpDataOemClient.priceSheetData(query, new Query() {{ -// setSize(99999); -// }}); -// -// if (pageR != null && pageR.getData() != null) { -// return pageR.getData().getRecords(); -// } -// return Collections.emptyList(); + PriceSheetQuery query = new PriceSheetQuery(); + query.setOcName(oemName); + query.setValidflags(Arrays.asList("有效", "无效")); + query.setPapertype("外协定价"); + query.setPricetype("工序协作"); + R> pageR = erpDataOemClient.priceSheetData(query, new Query() {{ + setSize(99999); + }}); + + if (pageR != null && pageR.getData() != null) { + return pageR.getData().getRecords(); + } + return Collections.emptyList(); //假数据测试用 - List priceSheetAllList = new ArrayList<>(); - PriceSheetVO priceSheet1 = new PriceSheetVO(); - priceSheet1.setPrice("60"); - priceSheet1.setSplycode("wx000001"); - priceSheet1.setSplyname(oemName); - priceSheet1.setPrtum("件"); - priceSheet1.setWono("110"); - priceSheet1.setSeqid("GXJG-20250228018"); - priceSheet1.setGxinfo("光亮腐蚀"); - priceSheet1.setStartdat("2026-01-15"); - priceSheet1.setValiddat("2026-12-31"); - priceSheet1.setStairflag("1"); - priceSheet1.setCoating_desc("涂色标"); - priceSheet1.setPrtlotno("JHT"); - priceSheetAllList.add(priceSheet1); - PriceSheetVO priceSheet2 = new PriceSheetVO(); - priceSheet2.setPrice("120"); - priceSheet2.setSplycode("wx000001"); - priceSheet2.setSplyname(oemName); - priceSheet2.setPrtum("件"); - priceSheet2.setWono("110"); - priceSheet2.setSeqid("GXJG-20250228018"); - priceSheet2.setGxinfo("光亮腐蚀"); - priceSheet2.setStartdat("2026-01-15"); - priceSheet2.setValiddat("2026-12-31"); - priceSheet2.setStairflag("1"); - priceSheet2.setCoating_desc("涂色带"); - priceSheet2.setPrtlotno("JHT"); - priceSheetAllList.add(priceSheet2); - PriceSheetVO priceSheet3 = new PriceSheetVO(); - priceSheet3.setPrice("180"); - priceSheet3.setSplycode("wx000001"); - priceSheet3.setSplyname(oemName); - priceSheet3.setPrtum("件"); - priceSheet3.setWono("110"); - priceSheet3.setSeqid("GXJG-20250228018"); - priceSheet3.setGxinfo("光亮腐蚀"); - priceSheet3.setStartdat("2026-01-15"); - priceSheet3.setValiddat("2026-12-31"); - priceSheet3.setStairflag("1"); - priceSheet3.setCoating_desc("涂箭头"); - priceSheet3.setPrtlotno("JHT"); - priceSheetAllList.add(priceSheet3); - PriceSheetVO priceSheet4 = new PriceSheetVO(); - priceSheet4.setPrice("60"); - priceSheet4.setSplycode("wx000001"); - priceSheet4.setSplyname(oemName); - priceSheet4.setPrtum("件"); - priceSheet4.setWono("320"); - priceSheet4.setSeqid("GXJG-20250228018"); - priceSheet4.setGxinfo("热处理铜合金电镀低应力镍"); - priceSheet4.setStartdat("2026-01-15"); - priceSheet4.setValiddat("2026-12-31"); - priceSheet4.setStairflag("1"); - priceSheet4.setCoating_desc("涂色标"); - priceSheet4.setPrtlotno("JHT"); - priceSheetAllList.add(priceSheet4); - PriceSheetVO priceSheet5 = new PriceSheetVO(); - priceSheet5.setPrice("60"); - priceSheet5.setSplycode("wx000001"); - priceSheet5.setSplyname(oemName); - priceSheet5.setPrtum("件"); - priceSheet5.setWono("320"); - priceSheet5.setSeqid("GXJG-20250228018"); - priceSheet5.setGxinfo("热处理铜合金电镀低应力镍"); - priceSheet5.setStartdat("2026-01-15"); - priceSheet5.setValiddat("2026-12-31"); - priceSheet5.setStairflag("1"); - priceSheet5.setCoating_desc("涂色带"); - priceSheet5.setPrtlotno("JHT"); - priceSheetAllList.add(priceSheet5); - PriceSheetVO priceSheet6 = new PriceSheetVO(); - priceSheet6.setPrice("60"); - priceSheet6.setSplycode("wx000001"); - priceSheet6.setSplyname(oemName); - priceSheet6.setPrtum("件"); - priceSheet6.setWono("320"); - priceSheet6.setSeqid("GXJG-20250228018"); - priceSheet6.setGxinfo("热处理铜合金电镀低应力镍"); - priceSheet6.setStartdat("2026-01-15"); - priceSheet6.setValiddat("2026-12-31"); - priceSheet6.setStairflag("1"); - priceSheet6.setCoating_desc("涂箭头"); - priceSheet6.setPrtlotno("JHT"); - priceSheetAllList.add(priceSheet6); - return priceSheetAllList; +// List priceSheetAllList = new ArrayList<>(); +// PriceSheetVO priceSheet1 = new PriceSheetVO(); +// priceSheet1.setPrice("60"); +// priceSheet1.setSplycode("wx000001"); +// priceSheet1.setSplyname(oemName); +// priceSheet1.setPrtum("件"); +// priceSheet1.setWono("110"); +// priceSheet1.setSeqid("GXJG-20250228018"); +// priceSheet1.setGxinfo("光亮腐蚀"); +// priceSheet1.setStartdat("2026-01-15"); +// priceSheet1.setValiddat("2026-12-31"); +// priceSheet1.setStairflag("1"); +// priceSheet1.setCoating_desc("涂色标"); +// priceSheet1.setPrtlotno("JHT"); +// priceSheetAllList.add(priceSheet1); +// PriceSheetVO priceSheet2 = new PriceSheetVO(); +// priceSheet2.setPrice("120"); +// priceSheet2.setSplycode("wx000001"); +// priceSheet2.setSplyname(oemName); +// priceSheet2.setPrtum("件"); +// priceSheet2.setWono("110"); +// priceSheet2.setSeqid("GXJG-20250228018"); +// priceSheet2.setGxinfo("光亮腐蚀"); +// priceSheet2.setStartdat("2026-01-15"); +// priceSheet2.setValiddat("2026-12-31"); +// priceSheet2.setStairflag("1"); +// priceSheet2.setCoating_desc("涂色带"); +// priceSheet2.setPrtlotno("JHT"); +// priceSheetAllList.add(priceSheet2); +// PriceSheetVO priceSheet3 = new PriceSheetVO(); +// priceSheet3.setPrice("180"); +// priceSheet3.setSplycode("wx000001"); +// priceSheet3.setSplyname(oemName); +// priceSheet3.setPrtum("件"); +// priceSheet3.setWono("110"); +// priceSheet3.setSeqid("GXJG-20250228018"); +// priceSheet3.setGxinfo("光亮腐蚀"); +// priceSheet3.setStartdat("2026-01-15"); +// priceSheet3.setValiddat("2026-12-31"); +// priceSheet3.setStairflag("1"); +// priceSheet3.setCoating_desc("涂箭头"); +// priceSheet3.setPrtlotno("JHT"); +// priceSheetAllList.add(priceSheet3); +// PriceSheetVO priceSheet4 = new PriceSheetVO(); +// priceSheet4.setPrice("60"); +// priceSheet4.setSplycode("wx000001"); +// priceSheet4.setSplyname(oemName); +// priceSheet4.setPrtum("件"); +// priceSheet4.setWono("320"); +// priceSheet4.setSeqid("GXJG-20250228018"); +// priceSheet4.setGxinfo("热处理铜合金电镀低应力镍"); +// priceSheet4.setStartdat("2026-01-15"); +// priceSheet4.setValiddat("2026-12-31"); +// priceSheet4.setStairflag("1"); +// priceSheet4.setCoating_desc("涂色标"); +// priceSheet4.setPrtlotno("JHT"); +// priceSheetAllList.add(priceSheet4); +// PriceSheetVO priceSheet5 = new PriceSheetVO(); +// priceSheet5.setPrice("60"); +// priceSheet5.setSplycode("wx000001"); +// priceSheet5.setSplyname(oemName); +// priceSheet5.setPrtum("件"); +// priceSheet5.setWono("320"); +// priceSheet5.setSeqid("GXJG-20250228018"); +// priceSheet5.setGxinfo("热处理铜合金电镀低应力镍"); +// priceSheet5.setStartdat("2026-01-15"); +// priceSheet5.setValiddat("2026-12-31"); +// priceSheet5.setStairflag("1"); +// priceSheet5.setCoating_desc("涂色带"); +// priceSheet5.setPrtlotno("JHT"); +// priceSheetAllList.add(priceSheet5); +// PriceSheetVO priceSheet6 = new PriceSheetVO(); +// priceSheet6.setPrice("60"); +// priceSheet6.setSplycode("wx000001"); +// priceSheet6.setSplyname(oemName); +// priceSheet6.setPrtum("件"); +// priceSheet6.setWono("320"); +// priceSheet6.setSeqid("GXJG-20250228018"); +// priceSheet6.setGxinfo("热处理铜合金电镀低应力镍"); +// priceSheet6.setStartdat("2026-01-15"); +// priceSheet6.setValiddat("2026-12-31"); +// priceSheet6.setStairflag("1"); +// priceSheet6.setCoating_desc("涂箭头"); +// priceSheet6.setPrtlotno("JHT"); +// priceSheetAllList.add(priceSheet6); +// return priceSheetAllList; } /** @@ -1746,8 +1746,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl