violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：

Browse Source 
1.装箱单上表头装箱方式不等于不装箱并且明细中业务分类等于整机，长宽高体积必填,
2.配件合同价格逻辑的调整：配件信息中配件资金使用方式取消按比例（折扣），
This commit is contained in:
25655 2025-02-25 17:08:07 +08:00
parent 3ac6eb18eb
commit 0a6862c809
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/yem/wm/es/encasement/from/EncaseMentEdit.java
View File

@ -162,6 +162,35 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
} else {
this.getView().showMessage("锁定重量是否确认为空！！！");
}
String yemPackingmethod = (String) this.getModel().getValue("yem_packingmethod");
if ("A".equals(yemPackingmethod)) {
//yem_businesssort = 'Z' AND (yem_long = null OR yem_wide = null OR yem_high = null OR yem_vol = null OR yem_volm3 = null OR yem_volm3sum = null)
DynamicObjectCollection yemImMaterialinfoMi = this.getModel().getEntryEntity("yem_im_materialinfo_mi");
if (yemImMaterialinfoMi.size() > 0) {
for (DynamicObject dynamicObject : yemImMaterialinfoMi) {
String yemBusinesssort = dynamicObject.getString("yem_businesssort");
if ("Z".equals(yemBusinesssort)) {
BigDecimal yemLong = dynamicObject.getBigDecimal("yem_long");
BigDecimal yemWide = dynamicObject.getBigDecimal("yem_wide");
BigDecimal yemHigh = dynamicObject.getBigDecimal("yem_high");
BigDecimal yemVol = dynamicObject.getBigDecimal("yem_vol");
BigDecimal yemVolm3 = dynamicObject.getBigDecimal("yem_volm3");
BigDecimal yemVolm3sum = dynamicObject.getBigDecimal("yem_volm3sum");
String string = "";
String seq = dynamicObject.getString("seq");
if (yemLong.compareTo(BigDecimal.ZERO) == 0) string = string +"第"+seq+"行，"+ "长为空，请填写！\n";
if (yemWide.compareTo(BigDecimal.ZERO) == 0) string = string + "第"+seq+"行，"+ "宽为空，请填写！\n";
if (yemHigh.compareTo(BigDecimal.ZERO) == 0) string = string + "第"+seq+"行，"+ "高为空，请填写！\n";
if (yemVol.compareTo(BigDecimal.ZERO) == 0) string = string + "第"+seq+"行，"+ "单台体积为空，请填写！\n";
if (yemVolm3.compareTo(BigDecimal.ZERO) == 0) string = string + "第"+seq+"行，"+ "单台体积m³为空，请填写！\n";
if (yemVolm3sum.compareTo(BigDecimal.ZERO) == 0) string = string + "第"+seq+"行，"+ "总体积（CBM）为空，请填写！";
if (!string.isEmpty()) {
this.getView().showMessage(string);
}
}
}
}
}
break;
case "statusconvertfqrzj":
lockRemovable(true);
@ -359,7 +388,7 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
dataEntity.set("yem_affirmmanpj", user);
dataEntity.set("yem_affirmdatepj", new Date());
}
if ("statusconvertqrzj".equals(operateKey)){
if ("statusconvertqrzj".equals(operateKey)) {
if (!yemWeightconfirmed.isEmpty()) {
dataEntity.set("yem_completionstatuszj", "B");
dataEntity.set("yem_affirmmanzj", user);

2
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java
View File

@ -622,7 +622,7 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
String string = yemBillbusstype.getString("number");
if (string.equals("BBT-2")) {
map.put("按金额（折扣）", "A");
map.put("按比例（折扣）", "B");
// map.put("按比例（折扣）", "B");
}
if ("BBT-3".equals(string) || "BBT-5".equals(string) || "BBT-4".equals(string)) {
map.put("按金额（全额抵扣）", "C");