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

fix:

Browse Source 
1.销售出库审核报错问题处理
This commit is contained in:
25655 2025-03-11 20:11:19 +08:00
parent 362aefb41d
commit 7d76821cfa
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java
View File

@ -283,7 +283,7 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
ClientUtils.countFrontDisAmt(model, rowIndex);//折扣前金额
ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别
ClientUtils.countAfterFrontPrice(model, rowIndex);//折扣后销售单价
calculateCostSharing(model);
// calculateCostSharing(model);
break;
case "yem_fobprice":
ClientUtils.countFobAmt(model, rowIndex);//fob金额
@ -381,11 +381,11 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
// calculateCostSharing(model);
ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别
break;
case "yem_sharethecost":
case "yem_sumedamount":
//
calculateCostSharing(model);
break;
// case "yem_sharethecost":
// case "yem_sumedamount":
////
//// calculateCostSharing(model);
// break;
}
}

32
src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java
View File

@ -93,7 +93,7 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn
String yemVehicleno = salesorder_z.getString("yem_vehicleno");
if (map.size() > 0) {
if (map.get(yemVehicleno) == null) {
DynamicObject adddevicefiles = adddevicefiles(dataEntitie,materialinfo, salesorder_z);
DynamicObject adddevicefiles = adddevicefiles(dataEntitie, materialinfo, salesorder_z);
OperationResult Operate = OperationServiceHelper.executeOperate("save",
adddevicefiles.getDynamicObjectType().getName(), new DynamicObject[]{adddevicefiles}, OperateOption.create());
if (Operate.isSuccess()) {
@ -101,7 +101,7 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn
}
}
} else {
DynamicObject adddevicefiles = adddevicefiles(dataEntitie,materialinfo, salesorder_z);
DynamicObject adddevicefiles = adddevicefiles(dataEntitie, materialinfo, salesorder_z);
OperationResult Operate = OperationServiceHelper.executeOperate("save",
adddevicefiles.getDynamicObjectType().getName(), new DynamicObject[]{adddevicefiles}, OperateOption.create());
if (Operate.isSuccess()) {
@ -113,7 +113,7 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn
SaveServiceHelper.save(new DynamicObject[]{dataEntitie});
}
public DynamicObject adddevicefiles(DynamicObject dataEntitie,DynamicObject materialinfo, DynamicObject submaterialinfo) {
public DynamicObject adddevicefiles(DynamicObject dataEntitie, DynamicObject materialinfo, DynamicObject submaterialinfo) {
String yem_vehicleno = submaterialinfo.getString("yem_vehicleno");
String yem_conbillnumber = materialinfo.getString("yem_conbillnumber");//合同编号
BigDecimal yem_qty = materialinfo.getBigDecimal("yem_qty");
@ -233,11 +233,14 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn
public Date Getmachinedata(String yem_framenumber, DynamicObject yemResourcescode) {
String Queryfield = AtlasUtils.Queryfield("PLAN_PIN", "INSTRUCTION_CODE", "JOB_TIME", "INSTRUCTION_NAME");
String sql = "select distinct " + Queryfield + " from VIEW_PLAN_JOB_WM where INSTRUCTION_NAME='上线' and PLAN_PIN='" + yem_framenumber + "'";//where TO_CHAR (enable_time, 'yyyy-mm-dd') >= '2023-01-01'
List<Map> fromCmmp = RequestCmmp.getFromCmmp(0L, sql, yemResourcescode.getDynamicObject("yem_productsgroup").getLong("id"));
if (fromCmmp.size() > 0) {
Map map = fromCmmp.get(0);
Date job_time = (Date) map.get("job_time");
return job_time;
DynamicObject yemProductsgroup = yemResourcescode.getDynamicObject("yem_productsgroup");
if (yemProductsgroup != null) {
List<Map> fromCmmp = RequestCmmp.getFromCmmp(0L, sql, yemProductsgroup.getLong("id"));
if (fromCmmp.size() > 0) {
Map map = fromCmmp.get(0);
Date job_time = (Date) map.get("job_time");
return job_time;
}
}
return null;
}
@ -246,11 +249,14 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn
public static Date Getanalysistdate(String yem_framenumber, DynamicObject yemResourcescode) {
String Queryfield = AtlasUtils.Queryfield("plmlastupdate");
String sql = "select distinct " + Queryfield + " from VIEW_ANALYZE_TIME_WM where plan_pin='" + yem_framenumber + "'";//where TO_CHAR (enable_time, 'yyyy-mm-dd') >= '2023-01-01'
List<Map> fromCmmp = RequestCmmp.getFromCmmp(0L, sql, yemResourcescode.getDynamicObject("yem_productsgroup").getLong("id"));
if (fromCmmp.size() > 0) {
Map map = fromCmmp.get(0);
Date job_time = (Date) map.get("plmlastupdate");
return job_time;
DynamicObject yemProductsgroup = yemResourcescode.getDynamicObject("yem_productsgroup");
if (yemProductsgroup != null) {
List<Map> fromCmmp = RequestCmmp.getFromCmmp(0L, sql, yemProductsgroup.getLong("id"));
if (fromCmmp.size() > 0) {
Map map = fromCmmp.get(0);
Date job_time = (Date) map.get("plmlastupdate");
return job_time;
}
}
return null;
}