wms修改18.2-报工页面的sap收货按钮，和成品入库页面的过账按钮修改

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 */

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<MesReportWork> rlist = wmsProductPutService.getReportList(mesReportWork);
+	public List getReportListSap(wmsReportWork mesReportWork) {
+		List<wmsReportWork> rlist = wmsProductPutService.getReportList(mesReportWork);
 		return rlist;
 	}
 	@PostMapping("/addReportListSap")
-	public AjaxResult addReportListSap(@RequestBody	List<MesReportWork> mesReportWork) {
+	public AjaxResult addReportListSap(@RequestBody	List<wmsReportWork> mesReportWork) {
 		String rlist = wmsProductPutService.addReportListSap(mesReportWork);
 		return AjaxResult.success(rlist);
 	}

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<MesReportWork> getReportList(MesReportWork mesReportWork);
+	List<wmsReportWork> getReportList(wmsReportWork mesReportWork);
 
 	List<WmsProductPut> selectWmsProductPutSAPByProDuct(String productOrder);
 

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<BaseWarehouse> selectBaseWarehouseList(BaseWarehouse baseWarehouse) {
+//		Map<String, Object> map=new HashMap<>();
+//		map.put("S_WERKS","1000");
+//		List<Map<String, Object>>	mapList=new ArrayList<>();
+//		mapList.add(map);
+//		remoteSapService.sapLgortInfo(mapList);
 		return baseWarehouseMapper.selectBaseWarehouseList(baseWarehouse);
 	}
 

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<MesReportWork> getReportList(MesReportWork mesReportWork) {
-	 List<MesReportWork> rlist = wmsProductPutMapper.getReportList(mesReportWork);;
+	public List<wmsReportWork> getReportList(wmsReportWork mesReportWork) {
+	 List<wmsReportWork> rlist = wmsProductPutMapper.getReportList(mesReportWork);;
 		return	rlist;
 	}
 
 	@Override
 	@DS("#header.poolName")
-	public String addReportListSap(List<MesReportWork> mesReportWorks) {
+	public String addReportListSap(List<wmsReportWork> mesReportWorks) {
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 		Date date = new Date();
 		String formattedDate = dateFormat.format(date);//批次
 		//List<WmsProductPut>	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<Map<String, Object>> mapList	=	new ArrayList<>();
-		for (MesReportWork	mesReportWork:
+		for (wmsReportWork	mesReportWork:
 				mesReportWorks) {
 			Map<String, Object> 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());

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>
-	<select id="getReportList" resultType="com.op.system.api.domain.wms.MesReportWork">
+	<select id="getReportList" resultType="com.op.system.api.domain.wms.wmsReportWork">
 		SELECT
 			mes_report_work.id,
 			mes_report_work.workorder_code workorderCode,