wms修改

op-modules/op-wms/pom.xml

@@ -88,6 +88,12 @@
             <version>0.0.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+
+
 
     </dependencies>
 

op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java

@@ -2,7 +2,9 @@ package com.op.wms.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import com.op.wms.domain.WmsRawOrderInSn;
+
+import com.op.wms.domain.*;
+import com.op.wms.service.IBaseWarehouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,13 +17,14 @@ import org.springframework.web.bind.annotation.RestController;
 import com.op.common.log.annotation.Log;
 import com.op.common.log.enums.BusinessType;
 import com.op.common.security.annotation.RequiresPermissions;
-import com.op.wms.domain.OdsProcureOrder;
 import com.op.wms.service.IOdsProcureOrderService;
 import com.op.common.core.web.controller.BaseController;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.core.utils.poi.ExcelUtil;
 import com.op.common.core.web.page.TableDataInfo;
 
+import static com.op.common.core.web.domain.AjaxResult.success;
+
 /**
  * 包材采购单Controller
  *
@@ -33,7 +36,8 @@ import com.op.common.core.web.page.TableDataInfo;
 public class OdsProcureOrderController extends BaseController {
 	@Autowired
 	private IOdsProcureOrderService odsProcureOrderService;
-
+	@Autowired
+	private IBaseWarehouseService baseWarehouseService;
 	/**
 	 * 查询包材采购单列表
 	 */
@@ -106,18 +110,7 @@ public class OdsProcureOrderController extends BaseController {
 		return success(orderList);
 	}
 
-	//**
 
-	/**
-	 * 用于出库任务页面－－查询
-	 * @param odsProcureOrder
-	 * @return
-	 */
-	@PostMapping("/PurchaseOrderOutboundTask")
-	public AjaxResult PurchaseOrderOutboundTask(@RequestBody OdsProcureOrder odsProcureOrder) {
-		List<OdsProcureOrder>	orderList =odsProcureOrderService.PurchaseOrderPda(odsProcureOrder);
-		return success(orderList);
-	}
 
 
 
@@ -141,4 +134,72 @@ public class OdsProcureOrderController extends BaseController {
 		return success(wmsRawOrderInSns);
 	}
 
+
+
+
+	/**
+	 *手持 －入库查询－－入参：ｐｏｎｏ，ｗｈｃｏｄｅ
+	 * userDefined1;//备用1－－收货１，入库２
+	 */
+
+	@PostMapping("/PurchaseOrderWarehousingPda")
+	public AjaxResult PurchaseOrderWarehousingPda(@RequestBody WmsRawOrderInSn wmsRawOrderInSn) {
+		List<WmsRawOrderInSn>	wmsRawOrderInSns =odsProcureOrderService.PurchaseOrderWarehousingPda(wmsRawOrderInSn);
+		//采购入库(PO)
+		return success(wmsRawOrderInSns);
+	}
+
+	/**
+	 * 查询仓库管理列表
+	 */
+
+	@PostMapping("/listCK")
+	public AjaxResult list(@RequestBody BaseWarehouse baseWarehouse) {
+
+		List<BaseWarehouse> list = baseWarehouseService.selectBaseWarehouseListTWO(baseWarehouse);
+		return success(list);
+	}
+
+	/**
+	 * 入库操作
+	 * @param wmsRawOrderInSn
+	 * @return
+	 */
+	@PostMapping("/PurchaseOrderRKPda")
+	public AjaxResult PurchaseOrderRKPda(@RequestBody WmsRawOrderInSn wmsRawOrderInSn) {
+		odsProcureOrderService.PurchaseOrderRKPda(wmsRawOrderInSn);
+		//采购入库(PO)
+		return success();
+	}
+
+
+	//**
+
+	/**
+	 * 用于出库任务页面－－查询
+	 *
+	 * @param odsProcureOrder
+	 * @return
+	 */
+	@PostMapping("/PurchaseOrderOutboundPda")
+	public AjaxResult PurchaseOrderOutboundPda(@RequestBody OdsProcureOutOrder odsProcureOrder) {
+		OdsProcureOutOrder	orderList =odsProcureOrderService.PurchaseOrderOutboundPda(odsProcureOrder);
+		return success(orderList);
+	}
+
+//**
+
+	/**
+	 * 用于出库任务页面－确认
+	 *
+	 * @param odsProcureOrder
+	 * @return
+	 */
+	@PostMapping("/addPurchaseOrderOutbound")
+	public AjaxResult addPurchaseOrderOutbound(@RequestBody OrderLine orderLine) {
+		odsProcureOrderService.addPurchaseOrderOutbound(orderLine);
+		return success();
+	}
+
+
 }

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java

@@ -1,18 +1,17 @@
 package com.op.wms.controller;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.op.common.core.domain.R;
 import com.op.common.core.utils.StringUtils;
 import com.op.common.core.web.domain.AjaxResult;
-import com.op.wms.domain.OdsProcureOrder;
+
-import com.op.wms.domain.WmsRawOrderInSn;
+import com.op.wms.domain.*;
-import com.op.wms.domain.WmsToWCSDTO;
+import com.op.wms.service.IBaseWarehouseService;
 import com.op.wms.service.IOdsProcureOrderService;
 import com.op.wms.service.IWmsToWCSmissionService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -26,7 +25,8 @@ public class WmsToWCSmissionController {
     private IWmsToWCSmissionService iWmsToWCSmissionService;
     @Autowired
     private IOdsProcureOrderService odsProcureOrderService;
-
+    @Autowired
+    private IBaseWarehouseService baseWarehouseService;
     /**
      * 包材请求入库---
      * @param wcsdto
@@ -117,6 +117,17 @@ public WmsToWCSDTO packingMaterialsOutBoundCompleted(@RequestBody WmsToWCSDTO wc
         return success(wmsRawOrderInSns);
     }
 
+    /**
+     * 查询仓库管理列表
+     */
+
+    @GetMapping("/list")
+    public AjaxResult list(@RequestBody BaseWarehouse baseWarehouse) {
+
+        List<BaseWarehouse> list = baseWarehouseService.selectBaseWarehouseListTWO(baseWarehouse);
+        return success(list);
+    }
+
     /**
      * 入库操作
      * @param wmsRawOrderInSn
@@ -129,5 +140,12 @@ public WmsToWCSDTO packingMaterialsOutBoundCompleted(@RequestBody WmsToWCSDTO wc
         return success();
     }
 
+    /**
+     * 采购订单接口
+     */
 
+    @PostMapping("/sapPurchaseOrderSync")
+    public R sapPurchaseOrderSync(@RequestBody SapBackflushMPQuery sapPurchaseOrderQuery){
+        return odsProcureOrderService.sapPurchaseOrderSync(sapPurchaseOrderQuery);
+    }
 }

op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java

@@ -2,6 +2,8 @@ package com.op.wms.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -22,6 +24,15 @@ public class OdsProcureOrder extends BaseEntity {
 	private String ID;
 	@Excel(name = "工厂编码")
 	private String factoryCode;
+	List<OdsProcureOrder>	list;
+
+	public List<OdsProcureOrder> getList() {
+		return list;
+	}
+
+	public void setList(List<OdsProcureOrder> list) {
+		this.list = list;
+	}
 
 	public String getFactoryCode() {
 		return factoryCode;

op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java

@@ -2,7 +2,10 @@ package com.op.wms.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.op.common.core.annotation.Excel;
@@ -14,6 +17,7 @@ import com.op.common.core.web.domain.BaseEntity;
  * @author Open Platform
  * @date 2023-07-06
  */
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class OdsProcureOutOrder extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
@@ -23,6 +27,14 @@ public class OdsProcureOutOrder extends BaseEntity {
 
 	/** ID */
 	private String ID;
+	List<OdsProcureOutOrder>	list;
+
+	public List<OdsProcureOutOrder> getList() {
+		return list;
+	}
+	public void setList(List<OdsProcureOutOrder> list) {
+		this.list = list;
+	}
 
 	/** 生成订单 */
 	@Excel(name = "生成订单")

op-modules/op-wms/src/main/java/com/op/wms/domain/OrderLine.java

@@ -3,6 +3,7 @@ package com.op.wms.domain;
 import com.op.common.core.web.domain.BaseEntity;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 public class OrderLine extends BaseEntity {
     private String   orderNo;//订单号
@@ -14,6 +15,19 @@ public class OrderLine extends BaseEntity {
     private String qualityStatus;//质检状态，1合格，2不合格
     private String stationNo;//包装线
 
+
+
+
+    List<OrderLine> list;
+
+    public List<OrderLine> getList() {
+        return list;
+    }
+
+    public void setList(List<OrderLine> list) {
+        this.list = list;
+    }
+
     public String getOrderNo() {
         return orderNo;
     }

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsOdsMateStorageNewsSn.java

@@ -18,7 +18,7 @@ public class WmsOdsMateStorageNewsSn extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/** 唯一序列号 */
-	private Long mateOrderInSnId;
+	private String mateOrderInSnId;
 
 	/** 仓库编码 */
 	@Excel(name = "仓库编码")
@@ -130,11 +130,11 @@ public class WmsOdsMateStorageNewsSn extends BaseEntity {
 	@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 	private String sapFactoryCode;
 
-	public void setMateOrderInSnId(Long mateOrderInSnId) {
+	public void setMateOrderInSnId(String mateOrderInSnId) {
 		this.mateOrderInSnId = mateOrderInSnId;
 	}
 
-	public Long getMateOrderInSnId() {
+	public String getMateOrderInSnId() {
 		return mateOrderInSnId;
 	}
 	public void setWhCode(String whCode) {

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java

@@ -58,4 +58,8 @@ public interface OdsProcureOutOrderMapper {
 	 * @return 结果
 	 */
 	public int deleteOdsProcureOutOrderByIDs(String[] IDs);
+
+	OdsProcureOutOrder selectmesPrepare(OdsProcureOutOrder odsProcureOrder);
+
+	List<OdsProcureOutOrder> selectmesPrepareDetail(OdsProcureOutOrder odsProcureOutOrder);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IBaseWarehouseService.java

@@ -60,4 +60,6 @@ public interface IBaseWarehouseService {
 
 	boolean checkWarehouseCodeUnique(BaseWarehouse baseWarehouse);
 	boolean checkWarehouseNameUnique(BaseWarehouse baseWarehouse);
+
+	List<BaseWarehouse> selectBaseWarehouseListTWO(BaseWarehouse baseWarehouse);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java

@@ -1,8 +1,9 @@
 package com.op.wms.service;
 
 import java.util.List;
-import com.op.wms.domain.OdsProcureOrder;
+
-import com.op.wms.domain.WmsRawOrderInSn;
+import com.op.common.core.domain.R;
+import com.op.wms.domain.*;
 
 /**
  * 包材采购单Service接口
@@ -68,4 +69,10 @@ public interface IOdsProcureOrderService {
 	List<WmsRawOrderInSn> PurchaseOrderWarehousingPda(WmsRawOrderInSn wmsRawOrderInSn);
 
 	void PurchaseOrderRKPda(WmsRawOrderInSn wmsRawOrderInSn);
+
+	OdsProcureOutOrder PurchaseOrderOutboundPda(OdsProcureOutOrder odsProcureOrder);
+
+	OrderLine addPurchaseOrderOutbound(OrderLine orderLine);
+
+	R sapPurchaseOrderSync(SapBackflushMPQuery sapPurchaseOrderQuery);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java

@@ -3,6 +3,7 @@ package com.op.wms.service.impl;
 import java.util.List;
 
 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.wms.domain.BaseEquipment;
@@ -133,4 +134,10 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService {
 			return true;
 		}
 	}
+
+	@Override
+	public List<BaseWarehouse> selectBaseWarehouseListTWO(BaseWarehouse baseWarehouse) {
+		DynamicDataSourceContextHolder.push("ds_" + baseWarehouse.getFactoryCode());
+		return baseWarehouseMapper.selectBaseWarehouseList(baseWarehouse);
+	}
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -1,19 +1,36 @@
 package com.op.wms.service.impl;
 
+import com.alibaba.fastjson2.JSONArray;
+
+
+import com.alibaba.fastjson.JSONObject;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+
 import java.util.Date;
 import java.util.List;
 
+
+import com.op.common.core.domain.R;
+
+
+
+
+import okhttp3.OkHttpClient;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okhttp3.Request;
+import okhttp3.Response;
+
+
+import java.io.IOException;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.wms.domain.*;
-import com.op.wms.mapper.WmsOdsMateStorageNewsMapper;
+import com.op.wms.mapper.*;
-import com.op.wms.mapper.WmsOdsMateStorageNewsSnMapper;
-import com.op.wms.mapper.WmsRawOrderInSnMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.op.wms.mapper.OdsProcureOrderMapper;
 import com.op.wms.service.IOdsProcureOrderService;
 
 /**
@@ -32,6 +49,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 	private WmsOdsMateStorageNewsSnMapper wmsOdsMateStorageNewsSnMapper;
 	@Autowired
 	private WmsOdsMateStorageNewsMapper wmsOdsMateStorageNewsMapper;
+	@Autowired
+	private OdsProcureOutOrderMapper odsProcureOutOrderMapper;
 
 	/**
 	 * 查询包材采购单
@@ -175,6 +194,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 //
 //		}
 		WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn=new WmsOdsMateStorageNewsSn();
+		wmsOdsMateStorageNewsSn.setMateOrderInSnId(IdUtils.fastSimpleUUID());
 		wmsOdsMateStorageNewsSn.setWhCode(wmsRawOrderInSn.getWhCode());//仓库编码
 		wmsOdsMateStorageNewsSn.setWlCode(wmsRawOrderInSn.getWlCode());//库位编码
 		wmsOdsMateStorageNewsSn.setMaterialCode(wmsRawOrderInSn.getMaterialCode());
@@ -218,4 +238,205 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 		wmsRawOrderInSnMapper.updateU1Byid(wmsRawOrderInSn);
 		//修改库存－－加，并且为冻结的，ｓａｐ过账后再解
 	}
+
+	@Override
+	@DS("#header.poolName")
+	public OdsProcureOutOrder PurchaseOrderOutboundPda(OdsProcureOutOrder odsProcureOrder) {
+			//母单，其中list里面是对应的子单
+		OdsProcureOutOrder	odsProcureOutOrder=	odsProcureOutOrderMapper.selectmesPrepare(odsProcureOrder);
+
+		if (odsProcureOutOrder!=null){
+			List<OdsProcureOutOrder>	orderList=	odsProcureOutOrderMapper.selectmesPrepareDetail(odsProcureOutOrder);
+			odsProcureOutOrder.setList(orderList);
+		}
+
+		return odsProcureOutOrder;
+
+	}
+
+	@Override
+	@DS("#header.poolName")
+	public OrderLine addPurchaseOrderOutbound(OrderLine orderLine) {
+		//自己生成行项目,,批次号
+		List<OrderLine> orderList=	orderLine.getList();
+
+		//根据订单号查询对应的最大批次号
+		Integer orderItem = 0;
+		for (OrderLine	orderLine1:
+				orderList) {
+			orderItem++;
+			orderLine1.setOrderLineNo(String.format("%05d", orderItem));
+			orderLine1.setBatchNo("00001");
+		}
+		//String	meg=	addPurchaseOrderOutboundSAP(orderLine);
+		//if ("OK".equals(meg)){//成功
+			OdsProcureOutOrder	odsProcureOutOrder=new OdsProcureOutOrder();
+			odsProcureOutOrder.setID(IdUtils.fastSimpleUUID());
+			odsProcureOutOrder.setProduceCode(orderLine.getOrderNo());
+			//odsProcureOutOrder.set
+			odsProcureOutOrderMapper.insertOdsProcureOutOrder(odsProcureOutOrder);
+			//修改库存
+		//}
+		return orderLine;
+	}
+
+	@Override
+	public R sapPurchaseOrderSync(SapBackflushMPQuery sapPurchaseOrderQuery) {
+//		DynamicDataSourceContextHolder.push("ds_" + sapPurchaseOrderQuery.getFactoryCode());
+//		try {
+//			// 获取调用 RFC 函数对象
+//			//获取连接
+//			//JCoDestination dest = SAPConnUtils.connect();
+//			JCoRepository repository = dest.getRepository();
+//			JCoFunction func = repository.getFunction("ZMES_GET_PROCURE");
+//			JCoParameterList jCoParameterList= func.getTableParameterList();
+//			System.out.println(jCoParameterList);
+//			if (func == null) {
+//				throw new RuntimeException("Function does not exist in SAP");
+//			}
+//			/** S_EBELN	采购订单号
+//			 *  S_EBELP	行项目
+//			 *  S_MATNR	物料号
+//			 *  S_PWERK 工厂
+//			 */
+//			if (!StringUtils.isNull(sapPurchaseOrderQuery.getEbeln())){
+//				JCoTable S_EBELN = func.getTableParameterList().getTable("S_EBELN");
+//				S_EBELN.appendRow();
+//				S_EBELN.setValue(Constants.SIGN, "I");
+//				S_EBELN.setValue(Constants.OPTION, "EQ");
+//				S_EBELN.setValue(Constants.LOW, sapPurchaseOrderQuery.getEbeln());
+//			}
+////			if (!StringUtils.isNull(sapPurchaseOrderQuery.getEbeln())){
+////				JCoTable S_EBELN = func.getTableParameterList().getTable("S_EBELP");
+////				S_EBELN.appendRow();
+////				S_EBELN.setValue(Constants.SIGN, "I");
+////				S_EBELN.setValue(Constants.OPTION, "EQ");
+////				S_EBELN.setValue(Constants.LOW, sapPurchaseOrderQuery.getEbeln());
+////			}
+////			if (!StringUtils.isNull(sapPurchaseOrderQuery.getMatnr())){
+////				JCoTable S_MATNR = func.getTableParameterList().getTable("S_MATNR");
+////				S_MATNR.appendRow();
+////				S_MATNR.setValue(Constants.SIGN, "I");
+////				S_MATNR.setValue(Constants.OPTION, "EQ");
+////				S_MATNR.setValue(Constants.LOW, sapPurchaseOrderQuery.getMatnr());
+////			}
+////
+////			if (!StringUtils.isNull(sapPurchaseOrderQuery.getPwerk())){
+////				JCoTable S_PWERK = func.getTableParameterList().getTable("S_PWERK");
+////				S_PWERK.appendRow();
+////				S_PWERK.setValue(Constants.SIGN, "I");
+////				S_PWERK.setValue(Constants.OPTION, "EQ");
+////				S_PWERK.setValue(Constants.LOW, sapPurchaseOrderQuery.getPwerk());
+////			}
+//			func.execute(dest);//执行调用函数
+//			// 获取 内表 - LT_PROCURE
+//			JCoTable maraTable = func.getTableParameterList().getTable("LT_PROCURE");
+//			JCoRecordMetaData metaData = maraTable.getRecordMetaData();
+//			System.out.println("###" + metaData.toString());
+//
+//			List<OdsProcureOrder> sapCustomList=new ArrayList<>();
+//			for (int i = 0; i <maraTable.getNumRows(); i++) {
+//				maraTable.setRow(i);
+//				OdsProcureOrder odsProcureOrder=new OdsProcureOrder();
+//				String EBELN = maraTable.getString("EBELN");//订单号
+//				String EBELP = maraTable.getString("EBELP");//行项目
+//				String MATNR = maraTable.getString("MATNR");//物料号
+//				String MAKTX = maraTable.getString("MAKTX");//物料描述（短文本
+//				String MENGE = maraTable.getString("MENGE");//采购订单数量
+//				String MEINS = maraTable.getString("MEINS");//采购订单的计量单位
+//				String ZMENGE = maraTable.getString("ZMENGE");//交货数量
+//				String ZMEINS = maraTable.getString("ZMEINS");//基本计量单位
+//				String LIFNR = maraTable.getString("LIFNR");//供应商帐户号
+//				String WERKS = maraTable.getString("WERKS");//工厂
+//				//String LGORT = maraTable.getString("LGORT");//库存地点
+//				//String EINDT = maraTable.getString("EINDT");//项目交货日期
+//				//String ELIKZ = maraTable.getString("ELIKZ");//交货已完成标识
+//				//String BEIZHU = maraTable.getString("BEIZHU");//注释
+//				odsProcureOrder.setSiteCode(WERKS);
+//				odsProcureOrder.setProcureCode(EBELN);
+//				odsProcureOrder.setMaterialCode(MATNR);
+//				odsProcureOrder.setMaterialDesc(MAKTX);
+//				odsProcureOrder.setOrderStatus("0");
+//				//odsProcureOrder.setPlanDate();
+//				odsProcureOrder.setPlanNumber(new BigDecimal(MENGE));
+//				odsProcureOrder.setUserDefined1(ZMENGE);
+//				odsProcureOrder.setUserDefined2(ZMEINS);
+//				odsProcureOrder.setSupplierCode(LIFNR);
+//				odsProcureOrder.setCreateBy("task");
+//				odsProcureOrder.setCreateDate(new Date());
+//				odsProcureOrder.setActive("1");
+//				odsProcureOrder.setUnit(MEINS);
+//				odsProcureOrderMapper.insertOdsProcureOrder(odsProcureOrder);
+//			}
+//			return R.ok();
+//		}catch (Exception e){
+//			return R.fail(e.getMessage());
+//		}
+		return R.ok();
+	}
+
+	//下发计划的接口
+	public String addPurchaseOrderOutboundSAP(OrderLine orderLinete) {
+		// 定义请求的URL地址
+		String url = "http://192.168.202.37:9001/api/v1/ReceiveMesMsg/packingMaterialsOutBoundRequest";
+		// 创建OkHttpClient实例
+		OkHttpClient client = new OkHttpClient();
+
+// 定义请求体的媒体类型为json
+		MediaType mediaType = MediaType.parse("application/json");
+		try {
+			// 创建JSON对象payload，并设置请求参数
+			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			Date date = new Date();
+			String formattedDate = dateFormat.format(date);
+			JSONObject payload = new JSONObject();
+			payload.put("reqCode", "eb7f8e9f-d1e8-499e-9bcb-e72d3ac195b0");
+			payload.put("reqTime",formattedDate );
+			payload.put("warehouseNo", orderLinete.getWarehouseNo());
+			payload.put("orderNo", orderLinete.getOrderNo());
+			JSONArray orderLines = new JSONArray();
+			List<OrderLine> orderList=	orderLinete.getList();
+			// 创建订单行数组，并将订单行对象添加到数组中
+			for (OrderLine	orderLine1:
+					 orderList	 ) {
+				JSONObject orderLine = new JSONObject();
+				orderLine.put("orderLineNo", orderLine1.getOrderLineNo());
+				orderLine.put("sku", orderLine1.getSku());
+				orderLine.put("batchNo",orderLine1.getBatchNo());
+				orderLine.put("qty", orderLine1.getQty());
+				orderLine.put("qualityStatus", 1);
+				orderLine.put("location", orderLine1.getStationNo());
+				orderLines.add(orderLine);
+			}
+			payload.put("orderLines", orderLines);
+			// 创建请求体，将JSON对象转换为字符串
+			RequestBody body = RequestBody.create(mediaType, payload.toString());
+			// 创建POST请求
+			Request request = new Request.Builder()
+					.url(url)
+					.post(body)
+					.build();
+			// 执行请求并获取响应
+			Response response = client.newCall(request).execute();
+			// 获取响应数据并转换为JSON对象
+			String responseData = response.body().string();
+			JSONObject result = JSONObject.parseObject(responseData);
+			// 获取返回结果结果JSON对象，请求编码、状态码和消息
+			result.get("reqCode");
+			result.get("code");
+			String	message= (String) result.get("message");
+			response.close();
+			return message;
+		} catch (IOException e) {
+			// 捕获IOException并处理异常
+			e.printStackTrace(); // 这里最好记录异常到日志文件或者进行其他处理
+		} finally {
+			// 关闭OkHttpClient
+			client.dispatcher().executorService().shutdown();
+		}
+// 返回0
+		return null;
+
+	}
+
 }

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml

@@ -215,4 +215,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{ID}
 		</foreach>
 	</delete>
+	<select id="selectmesPrepare" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
+		SELECT
+			prepare_id	id,
+			workorder_code	Produce_Code,
+			product_code	Material_Code,
+			product_name	Material_Desc,
+			unit	Unit,
+			product_date	Plan_Date,
+			prod_type	User_Defined1
+		FROM	mes_prepare	WHERE
+			workorder_code	=#{produceCode}
+
+	</select>
+	<select id="selectmesPrepareDetail" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
+		SELECT		record_id	ID,
+				  prepare_id	User_Defined2,
+				  material_code	Material_Code,
+				  material_name	Material_Desc,
+				  prod_type	User_Defined1,
+					unit	Unit,
+					quantity Plan_Number,
+				  factory_code	Site_code
+		FROM	mes_prepare_detail
+		WHERE	prepare_id=#{ID}
+
+	</select>
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml

@@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<insert id="insertWmsOdsMateStorageNewsSn" parameterType="WmsOdsMateStorageNewsSn" useGeneratedKeys="true" keyProperty="mateOrderInSnId">
 		insert into wms_ods_mate_storage_news_sn
 		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="mateOrderInSnId != null">mate_order_in_sn_id,</if>
 			<if test="whCode != null">wh_code,</if>
 			<if test="waCode != null">wa_code,</if>
 			<if test="wlCode != null">wl_code,</if>
@@ -111,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="sapFactoryCode != null">sap_factory_code,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="mateOrderInSnId != null">#{mateOrderInSnId},</if>
 			<if test="whCode != null">#{whCode},</if>
 			<if test="waCode != null">#{waCode},</if>
 			<if test="wlCode != null">#{wlCode},</if>