suojin
/
jonhon-mes-svr
23
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

旧MES结算数据生成

Browse Source
liweidong
maxiangong 1 week ago
parent 421c7090df
commit 0117c71529
3 changed files with 108 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java
  2. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
  3. 207
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

4
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java
Unescape View File

@ -138,4 +138,8 @@ public class PriceSheetVO {
*/ */
@Schema(description = "阶梯价计量单位") @Schema(description = "阶梯价计量单位")
private String stairunit; private String stairunit;
@Schema(description = "金银价格")
private String au_ag_price;
} }

4
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
Unescape View File

@ -384,8 +384,8 @@
a.ca_id, a.ca_id,
a.oc_id, a.oc_id,
a.pps_id, a.pps_id,
b.pps_code as psCode, b.pps_code as PS_CODE,
b.pps_name as psName, b.pps_name as PS_NAME,
c.oc_code, c.oc_code,
c.oc_name, c.oc_name,
d.rework_code, d.rework_code,

207
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
Unescape View File

@ -1563,106 +1563,106 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
* @return * @return
*/ */
private List<PriceSheetVO> getPriceSheetsWithCondition(String oemName) { private List<PriceSheetVO> getPriceSheetsWithCondition(String oemName) {
// PriceSheetQuery query = new PriceSheetQuery(); PriceSheetQuery query = new PriceSheetQuery();
// query.setOcName(oemName); query.setOcName(oemName);
// query.setValidflags(Arrays.asList("有效", "无效")); query.setValidflags(Arrays.asList("有效", "无效"));
// query.setPapertype("外协定价"); query.setPapertype("外协定价");
// query.setPricetype("工序协作"); query.setPricetype("工序协作");
// R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(query, new Query() {{ R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(query, new Query() {{
// setSize(99999); setSize(99999);
// }}); }});
//
// if (pageR != null && pageR.getData() != null) { if (pageR != null && pageR.getData() != null) {
// return pageR.getData().getRecords(); return pageR.getData().getRecords();
// } }
// return Collections.emptyList(); return Collections.emptyList();
//假数据测试用 //假数据测试用
List<PriceSheetVO> priceSheetAllList = new ArrayList<>(); // List<PriceSheetVO> priceSheetAllList = new ArrayList<>();
PriceSheetVO priceSheet1 = new PriceSheetVO(); // PriceSheetVO priceSheet1 = new PriceSheetVO();
priceSheet1.setPrice("60"); // priceSheet1.setPrice("60");
priceSheet1.setSplycode("wx000001"); // priceSheet1.setSplycode("wx000001");
priceSheet1.setSplyname(oemName); // priceSheet1.setSplyname(oemName);
priceSheet1.setPrtum("件"); // priceSheet1.setPrtum("件");
priceSheet1.setWono("110"); // priceSheet1.setWono("110");
priceSheet1.setSeqid("GXJG-20250228018"); // priceSheet1.setSeqid("GXJG-20250228018");
priceSheet1.setGxinfo("光亮腐蚀"); // priceSheet1.setGxinfo("光亮腐蚀");
priceSheet1.setStartdat("2026-01-15"); // priceSheet1.setStartdat("2026-01-15");
priceSheet1.setValiddat("2026-12-31"); // priceSheet1.setValiddat("2026-12-31");
priceSheet1.setStairflag("1"); // priceSheet1.setStairflag("1");
priceSheet1.setCoating_desc("涂色标"); // priceSheet1.setCoating_desc("涂色标");
priceSheet1.setPrtlotno("JHT"); // priceSheet1.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet1); // priceSheetAllList.add(priceSheet1);
PriceSheetVO priceSheet2 = new PriceSheetVO(); // PriceSheetVO priceSheet2 = new PriceSheetVO();
priceSheet2.setPrice("120"); // priceSheet2.setPrice("120");
priceSheet2.setSplycode("wx000001"); // priceSheet2.setSplycode("wx000001");
priceSheet2.setSplyname(oemName); // priceSheet2.setSplyname(oemName);
priceSheet2.setPrtum("件"); // priceSheet2.setPrtum("件");
priceSheet2.setWono("110"); // priceSheet2.setWono("110");
priceSheet2.setSeqid("GXJG-20250228018"); // priceSheet2.setSeqid("GXJG-20250228018");
priceSheet2.setGxinfo("光亮腐蚀"); // priceSheet2.setGxinfo("光亮腐蚀");
priceSheet2.setStartdat("2026-01-15"); // priceSheet2.setStartdat("2026-01-15");
priceSheet2.setValiddat("2026-12-31"); // priceSheet2.setValiddat("2026-12-31");
priceSheet2.setStairflag("1"); // priceSheet2.setStairflag("1");
priceSheet2.setCoating_desc("涂色带"); // priceSheet2.setCoating_desc("涂色带");
priceSheet2.setPrtlotno("JHT"); // priceSheet2.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet2); // priceSheetAllList.add(priceSheet2);
PriceSheetVO priceSheet3 = new PriceSheetVO(); // PriceSheetVO priceSheet3 = new PriceSheetVO();
priceSheet3.setPrice("180"); // priceSheet3.setPrice("180");
priceSheet3.setSplycode("wx000001"); // priceSheet3.setSplycode("wx000001");
priceSheet3.setSplyname(oemName); // priceSheet3.setSplyname(oemName);
priceSheet3.setPrtum("件"); // priceSheet3.setPrtum("件");
priceSheet3.setWono("110"); // priceSheet3.setWono("110");
priceSheet3.setSeqid("GXJG-20250228018"); // priceSheet3.setSeqid("GXJG-20250228018");
priceSheet3.setGxinfo("光亮腐蚀"); // priceSheet3.setGxinfo("光亮腐蚀");
priceSheet3.setStartdat("2026-01-15"); // priceSheet3.setStartdat("2026-01-15");
priceSheet3.setValiddat("2026-12-31"); // priceSheet3.setValiddat("2026-12-31");
priceSheet3.setStairflag("1"); // priceSheet3.setStairflag("1");
priceSheet3.setCoating_desc("涂箭头"); // priceSheet3.setCoating_desc("涂箭头");
priceSheet3.setPrtlotno("JHT"); // priceSheet3.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet3); // priceSheetAllList.add(priceSheet3);
PriceSheetVO priceSheet4 = new PriceSheetVO(); // PriceSheetVO priceSheet4 = new PriceSheetVO();
priceSheet4.setPrice("60"); // priceSheet4.setPrice("60");
priceSheet4.setSplycode("wx000001"); // priceSheet4.setSplycode("wx000001");
priceSheet4.setSplyname(oemName); // priceSheet4.setSplyname(oemName);
priceSheet4.setPrtum("件"); // priceSheet4.setPrtum("件");
priceSheet4.setWono("320"); // priceSheet4.setWono("320");
priceSheet4.setSeqid("GXJG-20250228018"); // priceSheet4.setSeqid("GXJG-20250228018");
priceSheet4.setGxinfo("热处理铜合金电镀低应力镍"); // priceSheet4.setGxinfo("热处理铜合金电镀低应力镍");
priceSheet4.setStartdat("2026-01-15"); // priceSheet4.setStartdat("2026-01-15");
priceSheet4.setValiddat("2026-12-31"); // priceSheet4.setValiddat("2026-12-31");
priceSheet4.setStairflag("1"); // priceSheet4.setStairflag("1");
priceSheet4.setCoating_desc("涂色标"); // priceSheet4.setCoating_desc("涂色标");
priceSheet4.setPrtlotno("JHT"); // priceSheet4.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet4); // priceSheetAllList.add(priceSheet4);
PriceSheetVO priceSheet5 = new PriceSheetVO(); // PriceSheetVO priceSheet5 = new PriceSheetVO();
priceSheet5.setPrice("60"); // priceSheet5.setPrice("60");
priceSheet5.setSplycode("wx000001"); // priceSheet5.setSplycode("wx000001");
priceSheet5.setSplyname(oemName); // priceSheet5.setSplyname(oemName);
priceSheet5.setPrtum("件"); // priceSheet5.setPrtum("件");
priceSheet5.setWono("320"); // priceSheet5.setWono("320");
priceSheet5.setSeqid("GXJG-20250228018"); // priceSheet5.setSeqid("GXJG-20250228018");
priceSheet5.setGxinfo("热处理铜合金电镀低应力镍"); // priceSheet5.setGxinfo("热处理铜合金电镀低应力镍");
priceSheet5.setStartdat("2026-01-15"); // priceSheet5.setStartdat("2026-01-15");
priceSheet5.setValiddat("2026-12-31"); // priceSheet5.setValiddat("2026-12-31");
priceSheet5.setStairflag("1"); // priceSheet5.setStairflag("1");
priceSheet5.setCoating_desc("涂色带"); // priceSheet5.setCoating_desc("涂色带");
priceSheet5.setPrtlotno("JHT"); // priceSheet5.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet5); // priceSheetAllList.add(priceSheet5);
PriceSheetVO priceSheet6 = new PriceSheetVO(); // PriceSheetVO priceSheet6 = new PriceSheetVO();
priceSheet6.setPrice("60"); // priceSheet6.setPrice("60");
priceSheet6.setSplycode("wx000001"); // priceSheet6.setSplycode("wx000001");
priceSheet6.setSplyname(oemName); // priceSheet6.setSplyname(oemName);
priceSheet6.setPrtum("件"); // priceSheet6.setPrtum("件");
priceSheet6.setWono("320"); // priceSheet6.setWono("320");
priceSheet6.setSeqid("GXJG-20250228018"); // priceSheet6.setSeqid("GXJG-20250228018");
priceSheet6.setGxinfo("热处理铜合金电镀低应力镍"); // priceSheet6.setGxinfo("热处理铜合金电镀低应力镍");
priceSheet6.setStartdat("2026-01-15"); // priceSheet6.setStartdat("2026-01-15");
priceSheet6.setValiddat("2026-12-31"); // priceSheet6.setValiddat("2026-12-31");
priceSheet6.setStairflag("1"); // priceSheet6.setStairflag("1");
priceSheet6.setCoating_desc("涂箭头"); // priceSheet6.setCoating_desc("涂箭头");
priceSheet6.setPrtlotno("JHT"); // priceSheet6.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet6); // priceSheetAllList.add(priceSheet6);
return priceSheetAllList; // return priceSheetAllList;
} }
/** /**
@ -1746,8 +1746,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
for (PriceSheetVO sheet : priceSheetList) { for (PriceSheetVO sheet : priceSheetList) {
boolean match = StringUtils.equals(sheet.getSplycode(), ocCode) && StringUtils.equals(sheet.getGxinfo(), psName) && StringUtils.equals(sheet.getPrtno(), partCode) && StringUtils.equals(sheet.getPrtlotno(), prodIdent) && StringUtils.equals(sheet.getWono(), ypCode); boolean match = StringUtils.equals(sheet.getSplycode(), ocCode) && StringUtils.equals(sheet.getGxinfo(), psName) && StringUtils.equals(sheet.getPrtno(), partCode) && StringUtils.equals(sheet.getPrtlotno(), prodIdent) && StringUtils.equals(sheet.getWono(), ypCode);
if (match && price != null && price.compareTo(BigDecimal.ZERO) != 0) { if (match && price != null && price.compareTo(BigDecimal.ZERO) != 0) {
// TODO 金银价格字段缺失 match = PriceMatcher.isContainsPrice(sheet.getAu_ag_price(), price);
match = PriceMatcher.isContainsPrice(sheet.getRemark(), price);
} }
if (match && ruleTieredPricing(statementVO, sheet)) { if (match && ruleTieredPricing(statementVO, sheet)) {
return setSettlementInfo(statementVO, sheet); return setSettlementInfo(statementVO, sheet);
@ -1776,8 +1775,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
for (PriceSheetVO sheet : priceSheetList) { for (PriceSheetVO sheet : priceSheetList) {
boolean match = StringUtils.equals(sheet.getSplycode(), ocCode) && StringUtils.equals(sheet.getGxinfo(), psName) && StringUtils.equals(sheet.getPrtno(), partCode) && StringUtils.equals(sheet.getPrtlotno(), prodIdent); boolean match = StringUtils.equals(sheet.getSplycode(), ocCode) && StringUtils.equals(sheet.getGxinfo(), psName) && StringUtils.equals(sheet.getPrtno(), partCode) && StringUtils.equals(sheet.getPrtlotno(), prodIdent);
if (match && price != null && price.compareTo(BigDecimal.ZERO) != 0) { if (match && price != null && price.compareTo(BigDecimal.ZERO) != 0) {
// TODO 金银价格字段缺失 match = PriceMatcher.isContainsPrice(sheet.getAu_ag_price(), price);
match = PriceMatcher.isContainsPrice(sheet.getRemark(), price);
} }
if (match && ruleTieredPricing(statementVO, sheet)) { if (match && ruleTieredPricing(statementVO, sheet)) {
return setSettlementInfo(statementVO, sheet); return setSettlementInfo(statementVO, sheet);
@ -1869,8 +1867,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
// TODO 报价单标准工艺代码没加 // TODO 报价单标准工艺代码没加
&& StringUtils.equals(sheet.getWono(), standardProcessCode); && StringUtils.equals(sheet.getWono(), standardProcessCode);
if (match && price != null && price.compareTo(BigDecimal.ZERO) != 0) { if (match && price != null && price.compareTo(BigDecimal.ZERO) != 0) {
// TODO 金银价格字段缺失 match = PriceMatcher.isContainsPrice(sheet.getAu_ag_price(), price);
match = PriceMatcher.isContainsPrice(sheet.getRemark(), price);
} }
if (match) { if (match) {
if (hasColorCount(statementVO)) { if (hasColorCount(statementVO)) {

Write Preview
Loading…
Cancel
Save