Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单创建增加生产版本字段

Browse Source
master
Yangwl 1 year ago
parent f31e349642
commit 15483d79ec
2 changed files with 156 additions and 156 deletions
Show Stats Download Patch File Download Diff File

9
op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCreateOrder.java
Unescape Escape View File

@ -17,7 +17,16 @@ public class SapCreateOrder {
private String dates;
//完成时间
private String datee;
//生产版本
private String verid;
public String getVerid() {
return verid;
}
public void setVerid(String verid) {
this.verid = verid;
}
public String getWerks() {
return werks;

29
op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
Unescape Escape View File

@ -93,9 +93,6 @@ public class SapOrderServiceImpl implements SapOrderService {
}
func.execute(dest);//执行调用函数
// 获取 内表 - ZMES_PRO
JCoTable maraTable = func.getTableParameterList().getTable("ZMES_PRO");
@ -120,7 +117,9 @@ public class SapOrderServiceImpl implements SapOrderService {
String ERNAM = maraTable.getString("ERNAM");
String ERDAT = maraTable.getString("ERDAT");
String STTXT = maraTable.getString("STTXT");
log.info("订单输出------："+"订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
String VERID = maraTable.getString("VERID");
log.info("订单输出------：" + "订单号：" + AUFNR + " - 订单类型：" + AUART + " - 生产版本：" + VERID + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
+ " - 订单的计划工厂：" + PWERK + " - 订单数量总计：" + GAMNG + " - 基本计量单位：" + GMEIN + " - 任务清单组码：" + PLNNR + " - 基本开始日期：" + GSTRP
+ " - 基本完成日期：" + GLTRP + " - 输入者：" + ERNAM + " - 创建日期：" + ERDAT + " - 系统状态：" + STTXT);
// System.out.println("订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
@ -131,6 +130,7 @@ public class SapOrderServiceImpl implements SapOrderService {
proOrder.setPlanFactoryCode(PWERK);
proOrder.setOrderCode(AUFNR);
proOrder.setOrderType(AUART);
proOrder.setAtrr2(VERID);
proOrder.setProdCode(PLNBEZ);
proOrder.setProdDesc(MAKTX);
proOrder.setQuantity(Long.parseLong(GAMNG.substring(0, GAMNG.indexOf("."))));
@ -183,6 +183,7 @@ public class SapOrderServiceImpl implements SapOrderService {
jCoParameterList.setValue("P_QUANTITY", sapCreateOrder.getQuantity());
jCoParameterList.setValue("P_DATES", sapCreateOrder.getDates());
jCoParameterList.setValue("P_DATEE", sapCreateOrder.getDatee());
jCoParameterList.setValue("P_VERID", sapCreateOrder.getVerid());
func.execute(dest);//执行调用函数
JCoParameterList J = func.getExportParameterList();
System.out.println(func.getExportParameterList());
@ -213,7 +214,6 @@ public class SapOrderServiceImpl implements SapOrderService {
@Override
public R sapCloseOrder(SapCloseOrderQuery sapCloseOrderQuery) {
StringBuilder Msg = new StringBuilder();
try {
//获取连接
@ -240,7 +240,6 @@ public class SapOrderServiceImpl implements SapOrderService {
// System.out.println(J);
String L_MSG1 = func.getExportParameterList().getString("L_MSG");
Msg.append(sapCloseOrderQuery.getLeadOrder() + L_MSG1 + ";");
//关闭子订单
jCoParameterList.setValue("P_AUFNR", sapCloseOrderQuery.getOrder());
func.execute(dest);//执行调用函数
@ -290,7 +289,6 @@ public class SapOrderServiceImpl implements SapOrderService {
* 生产订单报工工时 LT_GS
*/
JCoTable LT_GS_jCoTable = func.getTableParameterList().getTable("LT_GS");
// System.out.println("LT_GS_jCoTable"+LT_GS_jCoTable);
LT_GS_jCoTable.appendRow();
LT_GS_jCoTable.setValue("CONF_ACTIVITY1", sapRFW.getLt_gs().getConf_activity1());
LT_GS_jCoTable.setValue("CONF_ACTIVITY2", sapRFW.getLt_gs().getConf_activity2());
@ -302,24 +300,20 @@ public class SapOrderServiceImpl implements SapOrderService {
* MES生产订单报工货物移动修改 LT_HW
*/
JCoTable LT_HW_jCoTable = func.getTableParameterList().getTable("LT_HW");
//System.out.println("LT_HW_jCoTable"+LT_HW_jCoTable);
for (SapRFW.lt_hw lt_hw : sapRFW.getLt_hwList()) {
LT_HW_jCoTable.appendRow();
LT_HW_jCoTable.setValue("MATERIAL", lt_hw.getMaterial());
LT_HW_jCoTable.setValue("ENTRY_QNT", lt_hw.getEntry_qnt());
}
func.execute(dest);//执行调用函数
JCoParameterList J= func.getExportParameterList();
System.out.println(func.getExportParameterList());
String RETCODE = func.getExportParameterList().getString("RETCODE");
MESSAGE = func.getExportParameterList().getString("MESSAGE");
if (Constants.FAIL.equals(RETCODE)){
if (Constants.RFW_FAIL.equals(RETCODE)) {
log.error("订单号:" + sapRFW.getAufnr() + "报工失败" + MESSAGE);
return R.fail("订单号:" + sapRFW.getAufnr() + "报工失败" + MESSAGE);
}
log.error("订单号:" + sapRFW.getAufnr() + "报工成功" + MESSAGE);
return R.ok("", MESSAGE);
} catch (Exception e) {
return R.fail(e.getMessage());
}
@ -431,7 +425,6 @@ public class SapOrderServiceImpl implements SapOrderService {
} catch (Exception e) {
return R.fail(e.getMessage());
}
}
@Override
@ -446,12 +439,10 @@ public class SapOrderServiceImpl implements SapOrderService {
if (func == null) {
throw new RuntimeException("Function does not exist in SAP");
}
if (StringUtils.isEmpty(sapProOrder.getAufnr()))
{
if (StringUtils.isEmpty(sapProOrder.getAufnr())) {
return R.fail("订单号为空！");
}
if (StringUtils.isEmpty(sapProOrder.getQuantity()))
{
if (StringUtils.isEmpty(sapProOrder.getQuantity())) {
return R.fail("数量为空！");
}

Write Preview
Loading…
Cancel
Save