diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/MesReportWork.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java similarity index 99% rename from op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/MesReportWork.java rename to op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java index 339121bd..1e4ef003 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/MesReportWork.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java @@ -15,7 +15,7 @@ import java.util.Date; * @author Open Platform * @date 2023-08-24 */ -public class MesReportWork extends BaseEntity { +public class wmsReportWork extends BaseEntity { private static final long serialVersionUID = 1L; /** 记录id */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java index d6657584..db3f983d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java @@ -3,7 +3,7 @@ package com.op.wms.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.op.system.api.domain.wms.MesReportWork; +import com.op.system.api.domain.wms.wmsReportWork; import com.op.wms.domain.WmsProductPut; import org.springframework.beans.factory.annotation.Autowired; @@ -121,12 +121,12 @@ public class WmsProductPutController extends BaseController { } @GetMapping("/getReportListSap") - public List getReportListSap(MesReportWork mesReportWork) { - List rlist = wmsProductPutService.getReportList(mesReportWork); + public List getReportListSap(wmsReportWork mesReportWork) { + List rlist = wmsProductPutService.getReportList(mesReportWork); return rlist; } @PostMapping("/addReportListSap") - public AjaxResult addReportListSap(@RequestBody List mesReportWork) { + public AjaxResult addReportListSap(@RequestBody List mesReportWork) { String rlist = wmsProductPutService.addReportListSap(mesReportWork); return AjaxResult.success(rlist); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 8eb1ef48..c096c37f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -3,7 +3,7 @@ package com.op.wms.mapper; import java.util.List; -import com.op.system.api.domain.wms.MesReportWork; +import com.op.system.api.domain.wms.wmsReportWork; import com.op.wms.domain.WmsProductPut; import org.apache.ibatis.annotations.Param; @@ -71,7 +71,7 @@ public interface WmsProductPutMapper { public WmsProductPut selectWmsProductPutSAPById(String id); - List getReportList(MesReportWork mesReportWork); + List getReportList(wmsReportWork mesReportWork); List selectWmsProductPutSAPByProDuct(String productOrder); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java index 4a58fe54..c4613474 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java @@ -1,11 +1,15 @@ package com.op.wms.service.impl; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.DateUtils; import com.op.common.security.utils.SecurityUtils; +import com.op.system.api.RemoteSapService; import com.op.wms.domain.BaseEquipment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,7 +27,8 @@ import com.op.wms.service.IBaseWarehouseService; public class BaseWarehouseServiceImpl implements IBaseWarehouseService { @Autowired private BaseWarehouseMapper baseWarehouseMapper; - + @Autowired + private RemoteSapService remoteSapService; /** * 查询仓库管理 * @@ -45,6 +50,11 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService { @Override @DS("#header.poolName") public List selectBaseWarehouseList(BaseWarehouse baseWarehouse) { +// Map map=new HashMap<>(); +// map.put("S_WERKS","1000"); +// List> mapList=new ArrayList<>(); +// mapList.add(map); +// remoteSapService.sapLgortInfo(mapList); return baseWarehouseMapper.selectBaseWarehouseList(baseWarehouse); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index a2db2a7d..05c0d9bd 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; -import com.op.system.api.domain.wms.MesReportWork; +import com.op.system.api.domain.wms.wmsReportWork; import com.op.system.api.RemoteSapService; import com.op.wms.domain.*; import com.op.wms.mapper.*; @@ -294,19 +294,19 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override @DS("#header.poolName") - public List getReportList(MesReportWork mesReportWork) { - List rlist = wmsProductPutMapper.getReportList(mesReportWork);; + public List getReportList(wmsReportWork mesReportWork) { + List rlist = wmsProductPutMapper.getReportList(mesReportWork);; return rlist; } @Override @DS("#header.poolName") - public String addReportListSap(List mesReportWorks) { + public String addReportListSap(List mesReportWorks) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); Date date = new Date(); String formattedDate = dateFormat.format(date);//批次 //List wmsProductPutList= new ArrayList<>(); - for (MesReportWork mesReportWork: + for (wmsReportWork mesReportWork: mesReportWorks) { WmsProductPut wmsProductPutk=new WmsProductPut(); //wms_product_put @@ -369,7 +369,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } } List> mapList = new ArrayList<>(); - for (MesReportWork mesReportWork: + for (wmsReportWork mesReportWork: mesReportWorks) { Map map = new HashMap<>(); map.put("AUFNR",mesReportWork.getWorkorderCodeSap()); @@ -385,7 +385,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { R result=remoteSapService.sapOrderReceipt(mapList); int code= result.getCode(); String msg= result.getMsg(); - for (MesReportWork mesReportWork: + for (wmsReportWork mesReportWork: mesReportWorks) { WmsProductPut wmsProductPut2=new WmsProductPut(); wmsProductPut2.setId(mesReportWork.getId()); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index 6bee4cb6..f73be403 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -288,7 +288,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND wms_product_put.status= '1' AND wms_product_put.SAP_status IN ( 0, 2 ) - SELECT mes_report_work.id, mes_report_work.workorder_code workorderCode,