diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java index d5993b18..4eacd38f 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java @@ -91,4 +91,8 @@ public interface RemoteSapService { /**采购订单收货过账*/ @PostMapping("/sap/sapPOrderGoodsReceipt") public R sapPOrderGoodsReceipt(@RequestBody(required = false) List> mapList); + + /**101类型订单收货*/ + @PostMapping("/sap/sapOrderReceipt") + public R sapOrderReceipt(@RequestBody(required = false) List> mapList); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java index 56102a91..3e84e5de 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java @@ -100,6 +100,17 @@ public class SysUser extends BaseEntity { } + //新增 微信账号 + private String wxId; + + public String getWxId() { + return wxId; + } + + public void setWxId(String wxId) { + this.wxId = wxId; + } + public String getUserCode() { return userCode; } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java index f054f17f..2fb7821f 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java @@ -109,6 +109,11 @@ public class RemoteSapFallbackFactory implements FallbackFactory> mapList) { + return R.fail("101类型订单收货过账失败" + throwable.getMessage()); + } + }; } } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java index 0e56963e..ac38e60d 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java @@ -414,13 +414,20 @@ public class SapController extends BaseController { /** * 智慧工厂101类型订单收货 * 订单为母订单 - * @param sapOrderReceiptQuery + * * AUFNR CHAR12 订单号 必填 + * * WERKS 工厂 + * * LGORT CHAR4 库位 必填 + * * QUANTITY 数量 + * * ERFME UNIT 条目单位 + * * BATCH 批号 + * * HSDAT DATS8 生产日期 必填 + * @param mapList * @return */ @PostMapping("/sapOrderReceipt") @Log(title = "智慧工厂101类型订单收货", businessType = BusinessType.SAP) - public R sapOrderReceipt(@RequestBody SapOrderReceiptQuery sapOrderReceiptQuery){ - return sapOrderService.sapOrderReceipt(sapOrderReceiptQuery); + public R sapOrderReceipt(@RequestBody(required = false) List> mapList){ + return sapOrderService.sapOrderReceipt(mapList); } /**================================WMS=============================*/ @@ -438,7 +445,7 @@ public class SapController extends BaseController { /** * 成品下线入库 - *ZMES_201_MB1A（新增） + * ZMES_201_MB1A（新增） * ZMES_961_MB1A * ZMES_962_MB1A * @param diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapOrderReceiptQuery.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapOrderReceiptQuery.java index a07f4d17..4ba54d0f 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapOrderReceiptQuery.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapOrderReceiptQuery.java @@ -2,22 +2,24 @@ package com.op.sap.domain.vo; /** * AUFNR CHAR12 订单号 必填 + * WERKS 工厂 * LGORT CHAR4 库位 必填 - * ERFMG QUAN-13-3 数量 必填 - * CHARG CHAR10 批号 必填 - * HSDAT DATS8 生产日期 必填 + * QUANTITY 数量 * ERFME UNIT 条目单位 + * BATCH 批号 + * HSDAT DATS8 生产日期 必填 * auth YangWL */ public class SapOrderReceiptQuery { private String aufnr; + private String werks; private String lgort; - private String erfmg; - private String charg; - private String hsdat; + private String quantity; private String erfme; + private String batch; + private String hsdat; public String getAufnr() { return aufnr; @@ -27,6 +29,14 @@ public class SapOrderReceiptQuery { this.aufnr = aufnr; } + public String getWerks() { + return werks; + } + + public void setWerks(String werks) { + this.werks = werks; + } + public String getLgort() { return lgort; } @@ -35,47 +45,48 @@ public class SapOrderReceiptQuery { this.lgort = lgort; } - public String getErfmg() { - return erfmg; + public String getQuantity() { + return quantity; } - public void setErfmg(String erfmg) { - this.erfmg = erfmg; + public void setQuantity(String quantit) { + this.quantity = quantit; } - public String getCharg() { - return charg; + public String getErfme() { + return erfme; } - public void setCharg(String charg) { - this.charg = charg; + public void setErfme(String erfme) { + this.erfme = erfme; } - public String getHsdat() { - return hsdat; + public String getBatch() { + return batch; } - public void setHsdat(String hsdat) { - this.hsdat = hsdat; + public void setBatch(String batch) { + this.batch = batch; } - public String getErfme() { - return erfme; + public String getHsdat() { + return hsdat; } - public void setErfme(String erfme) { - this.erfme = erfme; + public void setHsdat(String hsdat) { + this.hsdat = hsdat; } @Override public String toString() { return "SapOrderReceiptQuery{" + "aufnr='" + aufnr + '\'' + + ", werks='" + werks + '\'' + ", lgort='" + lgort + '\'' + - ", erfmg='" + erfmg + '\'' + - ", charg='" + charg + '\'' + - ", hsdat='" + hsdat + '\'' + + ", quantit='" + quantity + '\'' + ", erfme='" + erfme + '\'' + + ", batch='" + batch + '\'' + + ", hsdat='" + hsdat + '\'' + '}'; } } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java index 4d4d23de..d9c3aaa4 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java @@ -3,6 +3,7 @@ package com.op.sap.service; import com.op.common.core.domain.R; import com.op.sap.domain.vo.SapOrderReceiptQuery; +import com.op.system.api.domain.sap.SapPurchaseOrderQuery; import com.op.system.api.domain.sap.*; import com.op.system.api.model.SapProOrder; @@ -49,7 +50,7 @@ public interface SapOrderService { R shopUpdateSync(SapShopOrderQuery sapProOrder); - R sapOrderReceipt(SapOrderReceiptQuery sapOrderReceiptQuery); + R sapOrderReceipt(List> mapList); R sapPOrderGoodsReceipt(List> mapList); diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 7e7a9d74..88f3ff50 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -8,9 +8,13 @@ import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.sap.domain.vo.SapOrderReceiptQuery; +import com.op.system.api.domain.sap.SapPurchaseOrderQuery; import com.op.sap.service.SapOrderService; -import com.op.system.api.domain.sap.*; +import com.op.system.api.domain.sap.SapCloseOrderQuery; +import com.op.system.api.domain.sap.SapCreateOrder; +import com.op.system.api.domain.sap.SapRFW; +import com.op.system.api.domain.sap.SapShopOrderQuery; import com.op.system.api.model.SapProOrder; import com.sap.conn.jco.*; @@ -478,62 +482,40 @@ public class SapOrderServiceImpl implements SapOrderService { } @Override - public R sapOrderReceipt(SapOrderReceiptQuery sapOrderReceiptQuery) { + public R sapOrderReceipt(List> mapList) { try { - log.info("智慧工厂101类型订单收货入参-------"+sapOrderReceiptQuery.toString()); + log.info("智慧工厂101类型订单收货入参-------"+mapList.toString()); JCoRepository repository = dest.getRepository(); JCoFunction func = repository.getFunction("ZMES_101_MIGO"); - //System.out.println(jCoParameterList); if (func == null) { throw new RuntimeException("Function does not exist in SAP"); } - if (StringUtils.isEmpty(sapOrderReceiptQuery.getAufnr())) - { - return R.fail("订单号为空！"); - } - if (StringUtils.isEmpty(sapOrderReceiptQuery.getLgort())) - { - return R.fail("库位为空！"); - } - if (StringUtils.isEmpty(sapOrderReceiptQuery.getErfmg())) - { - return R.fail("数量为空！"); - } - if (StringUtils.isEmpty(sapOrderReceiptQuery.getCharg())) - { - return R.fail("批号为空！"); - } - if (StringUtils.isEmpty(sapOrderReceiptQuery.getHsdat())) - { - return R.fail("生产日期为空！"); - } - // 配置传入参数 JCoTable L_ITEM = func.getTableParameterList().getTable("L_ITEM"); - L_ITEM.appendRow(); - - // System.out.println(L_ITEM); - L_ITEM.setValue("AUFNR",sapOrderReceiptQuery.getAufnr()); - L_ITEM.setValue("WERKS","1000"); - L_ITEM.setValue("LGORT",sapOrderReceiptQuery.getLgort()); - L_ITEM.setValue("QUANTITY",sapOrderReceiptQuery.getErfmg()); - L_ITEM.setValue("BATCH",sapOrderReceiptQuery.getCharg()); - L_ITEM.setValue("HSDAT",sapOrderReceiptQuery.getHsdat()); - L_ITEM.setValue("ERFME",sapOrderReceiptQuery.getErfme()); + for (Map stringObjectMap:mapList){ + L_ITEM.appendRow(); + L_ITEM.setValue("AUFNR",stringObjectMap.get("AUFNR")); + L_ITEM.setValue("WERKS",stringObjectMap.get("WERKS")); + L_ITEM.setValue("LGORT",stringObjectMap.get("LGORT")); + L_ITEM.setValue("QUANTITY",stringObjectMap.get("QUANTITY")); + L_ITEM.setValue("BATCH",stringObjectMap.get("BATCH")); + L_ITEM.setValue("HSDAT",stringObjectMap.get("HSDAT")); + L_ITEM.setValue("ERFME",stringObjectMap.get("ERFME")); + } func.execute(dest);//执行调用函数 - // System.out.println(func.getExportParameterList()); String RETCODE= func.getExportParameterList().getString("RETCODE"); String MESSAGE= func.getExportParameterList().getString("L_MSG"); String MATERIALDOCUMENT= func.getExportParameterList().getString("MATERIALDOCUMENT"); if ((Constants.FAIL).equals(Integer.parseInt(RETCODE))){ log.error("订单收货结果-----"+MESSAGE); - return R.fail(null,"订单号:"+sapOrderReceiptQuery.getAufnr()+MESSAGE); + return R.fail(MESSAGE); }else { log.info("订单收货结果-----"+MESSAGE); - return R.ok(MATERIALDOCUMENT,"订单号:"+sapOrderReceiptQuery.getAufnr()+MESSAGE); + return R.ok(MATERIALDOCUMENT,MESSAGE); } + }catch (Exception e){ log.error(e.getMessage()); return R.fail(e.getMessage()); @@ -615,17 +597,6 @@ public class SapOrderServiceImpl implements SapOrderService { } } -// public static void main(String[] args) { -// List sapBackflushMPQueryList=new ArrayList<>(); -// SapBackflushMPQuery sapBackflushMPQuery=new SapBackflushMPQuery(); -// sapBackflushMPQuery.setMatnr("000000020000000280"); -// sapBackflushMPQuery.setPlant("1000"); -// sapBackflushMPQuery.setLgort("0013"); -// sapBackflushMPQuery.setQuantity("3600"); -// sapBackflushMPQuery.setMeins("ST"); -// sapBackflushMPQueryList.add(sapBackflushMPQuery); -// System.out.println(JSONObject.toJSONString(sapBackflushMPQueryList)); -// } } diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java index d9bcfd2a..c1e656d2 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import javax.servlet.http.HttpServletRequest; import javax.validation.Validator; import com.op.system.domain.SysDatasource; @@ -28,6 +29,8 @@ import com.op.system.domain.SysUserPost; import com.op.system.domain.SysUserRole; import com.op.system.service.ISysConfigService; import com.op.system.service.ISysUserService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; /** * 用户 业务层处理 @@ -242,13 +245,17 @@ public class SysUserServiceImpl implements ISysUserService { // 新增用户与角色管理 insertUserRole(user); // 加工厂数据权限 + //工厂号 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + user.setDeptId(Long.parseLong(request.getHeader(key.substring(8)).replace("ds_",""))); insertUserDB(user); return rows; } public void insertUserDB(SysUser user) { // 新增用户与园区数据源 SysDatasource qo = new SysDatasource(); - qo.setDeptId(user.getDeptId());// + qo.setDeptId(user.getDeptId()); //先删掉 sysDatasourceMapper.deletUserDB(user.getUserId().toString()); @@ -293,6 +300,9 @@ public class SysUserServiceImpl implements ISysUserService { // 新增用户与岗位管理 insertUserPost(user); // 加工厂数据权限 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + user.setDeptId(Long.parseLong(request.getHeader(key.substring(8)).replace("ds_",""))); insertUserDB(user); return userMapper.updateUser(user); } diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml index 2781b88e..b7c7b6e3 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -23,8 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -47,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.wx_id, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -57,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"