diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
index ef625d195..42b92e918 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
@@ -103,7 +103,13 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     @Override
     @DS("#header.poolName")
     public List<OdsProcureOrder> selectOdsProcureOrderList(OdsProcureOrder odsProcureOrder) {
-        return odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder);
+        List<OdsProcureOrder>   orderList=   odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder);
+        for (OdsProcureOrder    order:
+        orderList) {
+            String name = odsProcureOrderMapper.selectBaseSupplier(order);
+            order.setSupplierName(name);
+        }
+        return orderList;
     }
 
     /**
@@ -172,7 +178,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         WmsRawOrderInSn wmsRawOrderInSn = new WmsRawOrderInSn();
         wmsRawOrderInSn.setRawOrderInSnId(IdUtils.fastSimpleUUID());
         wmsRawOrderInSn.setUserDefined1("1");//１是收货，２是入库
-        wmsRawOrderInSn.setUserDefined2(odsProcureOrder.getIncomeBatchNo());//批次
+        wmsRawOrderInSn.setUserDefined2(order.getUserDefined7());//批次
         wmsRawOrderInSn.setWhCode(odsProcureOrder.getWhCode());//厂库编号
         wmsRawOrderInSn.setWaCode(odsProcureOrder.getWaCode());
         wmsRawOrderInSn.setWlCode("00001-1-01");//先都设置为同一个库位
@@ -677,6 +683,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             if (orderList.size() > 0) {
                 continue;
             }
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+            Date date = new Date();
+            String formattedDate = dateFormat.format(date);
+            order.setUserDefined7(formattedDate+order.getUserDefined3());
             order.setPlanNumber(new BigDecimal(sapPurchaseOrderQuery1.get("menge")));
             order.setUnit(sapPurchaseOrderQuery1.get("meins"));
             order.setSupplierCode(sapPurchaseOrderQuery1.get("lifnr"));
@@ -730,11 +740,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     public String PurchaseOrderdeliPdaConfirm(OdsProcureOrder odsProcureOrder) {
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
         String  result="操作成功";
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-        Date date = new Date();
-        String formattedDate = dateFormat.format(date);
-        WmsRawOrderInSn wmsRawOrderInSn1=new WmsRawOrderInSn();
+//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+//        Date date = new Date();
+//        String formattedDate = dateFormat.format(date);
+//        WmsRawOrderInSn wmsRawOrderInSn1=new WmsRawOrderInSn();
         OdsProcureOrder order = odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder.getID());
+        String formattedDate=order.getUserDefined7();
         List<WmsRawOrderInSn> wmsRawOrderInSns  =   wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaList(odsProcureOrder);
         WmsRawOrderInSn wmsRawOrderInSnTEM  =   wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaById(odsProcureOrder);
         if(wmsRawOrderInSns.size()>0){
@@ -929,7 +940,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
            }
             order.setProcureCode(sapPurchaseOrderQuery1.get("orderNum"));
             order.setSiteCode(sapPurchaseOrderQuery1.get("werks"));
-            order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次
+            order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//行项目
             if (order.getUserDefined3()!=null){
                 order.setUserDefined3("000"+order.getUserDefined3());
             }
@@ -945,6 +956,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 //这个地方判断下是不是采购单已经被插入了，如果是的话，并且是走的送货单的路径，那就把送货单给她附上
                 continue;
             }
+           SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+            Date date = new Date();
+            String formattedDate = dateFormat.format(date);
+            order.setUserDefined7(formattedDate+order.getUserDefined3());
             order.setUserDefined11(sapPurchaseOrderQuery1.get("realDate"));
             order.setPlanNumber(new BigDecimal(sapPurchaseOrderQuery1.get("thisDeliNum")));
             order.setUnit(sapPurchaseOrderQuery1.get("unit"));
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml
index 513633c3a..7e0496d20 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml
@@ -23,10 +23,11 @@
         <result property="pvc" column="pvc"/>
         <result property="supportPlate" column="support_plate"/>
         <result property="other" column="other"/>
+        <result property="palletNum" column="pallet_num"/>
     </resultMap>
 
     <sql id="selectBaseProductAttachedVo">
-		select id, product_code, category, pc, iei, man_standar, spray_way, blank_diameter, blank_no, spray_volume, liquid_no, endometrial_dosage, outer_film_dosage, support, support_no, pvc, support_plate, other from base_product_attached
+		select id, product_code, category, pc, iei, man_standar, spray_way, blank_diameter, blank_no, spray_volume, liquid_no, endometrial_dosage, outer_film_dosage, support, support_no, pvc, support_plate,	pallet_num, other from base_product_attached
 	</sql>
 
     <select id="selectBaseProductAttachedList" parameterType="BaseProductAttached"