diff --git a/docker_file/seamom_package/apk/Debug/haierWMS.exe b/docker_file/seamom_package/apk/Debug/haierWMS.exe
index 9fa4163..6bb8a32 100644
Binary files a/docker_file/seamom_package/apk/Debug/haierWMS.exe and b/docker_file/seamom_package/apk/Debug/haierWMS.exe differ
diff --git a/docker_file/seamom_package/apk/Debug/haierWMS.pdb b/docker_file/seamom_package/apk/Debug/haierWMS.pdb
index 688697c..cb6652f 100644
Binary files a/docker_file/seamom_package/apk/Debug/haierWMS.pdb and b/docker_file/seamom_package/apk/Debug/haierWMS.pdb differ
diff --git a/docker_file/seamom_package/apk/Debug/languages/ChineseSimplified.xml b/docker_file/seamom_package/apk/Debug/languages/ChineseSimplified.xml
index 1a80817..ed3ed25 100644
--- a/docker_file/seamom_package/apk/Debug/languages/ChineseSimplified.xml
+++ b/docker_file/seamom_package/apk/Debug/languages/ChineseSimplified.xml
@@ -147,6 +147,13 @@
       <Control name="btnSpareUpShelf" text="备件上架"/>
       <Control name="btnSpareDownShelf" text="备件下架"/>
       <Control name="btnSpareGoodsIssue" text="备件出库"/>
+      <Control name="butMaterialConversion309" text="309物料转换"/>
+      <Control name="butMaterialRelationshipY01" text="BOM关系外扣料"/>
+      <Control name="butFictitiousAppendMat" text="虚拟补料"/>
+      <Control name="butTransferIssue" text="调拨出库"/>
+      <Control name="butTransferReceipt" text="调拨入库"/>
+      <Control name="btnSpareDNReceive" text="备件DN收货"/>
+
     </Controls>
     <Message>
       <Message name="messageSuccess1" text="保存成功"/>
@@ -255,6 +262,55 @@
     </Message>
   </Form>
 
+  <Form>
+    <!--原材料虚拟补料-->
+    <Name>fictitious_append_mat</Name>
+    <Controls>
+      <Control name="fictitious_append_mat" text="虚拟补料-泰国"/>
+      <Control name="lblPrdOrder" text="订单号"/>
+      <Control name="btnSearch" text="查询"/>
+      <Control name="lblMaterialCode" text="物料编码"/>
+      <Control name="lblMaterialDesc" text="物料描述"/>
+      <Control name="lblRequestQty" text="需求数量"/>
+      <Control name="lblAppendedQty" text="已补数量"/>
+      <Control name="lblSendSpot" text="库存地点"/>
+      <Control name="lblTotalQty" text="累计数量"/>
+      <Control name="lblQueryLoc" text="查询"/>
+      <Control name="lblLocationCode" text="库存"/>
+      <Control name="lblNowQty" text="本次数量"/>
+      <Control name="columnHeader21" text="物料编码"/>
+      <Control name="columnHeader22" text="库位"/>
+      <Control name="columnHeader23" text="数量"/>
+      <Control name="columnHeader24" text="库存地点"/>
+      <Control name="lblLoginName" text="补料人"/>
+      <Control name="lblRfPwd" text="口令"/>
+      <Control name="btnAdd" text="添加"/>
+      <Control name="btnDelete" text="删除"/>
+      <Control name="btnConfirm" text="提交"/>
+      <Control name="btnDetail" text="明细"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="只允许输入正整数和小数"/>
+      <Message name="message2" text="本次补料数量不能小于零"/>
+      <Message name="message3" text="请输入订单号"/>
+      <Message name="message4" text="请选择想要修改的数据"/>
+      <Message name="message5" text="请选择想要保存的数据"/>
+      <Message name="message6" text="请选择库位"/>
+      <Message name="message7" text="请选择要查看的数据"/>
+      <Message name="message8" text="同一库位只能添加一次"/>
+      <Message name="message9" text="添加的库位SAP库位只能相同"/>
+      <Message name="message10" text="请添加库位和数量"/>
+      <Message name="message11" text="请输入补料人"/>
+      <Message name="message12" text="请输入密码"/>
+      <Message name="message13" text="该物料库存不足"/>
+      <Message name="message14" text="历史订单解锁失败，请重新操作"/>
+      <Message name="messageSuccess1" text="保存成功"/>
+      <Message name="messageError1" text="网络不稳定，请重试"/>
+      <Message name="messageError2" text="查询失败"/>
+      <Message name="messageError3" text="保存失败"/>
+    </Message>
+  </Form>
+
   <Form>
     <!--原材料补料-->
     <Name>form_append_mat_detail</Name>
@@ -783,6 +839,7 @@
       <Control name="lblOriginWl" text="源库位"/>
       <Control name="lblAimWl" text="目标库位"/>
       <Control name="lblCostCenter" text="成品中心"/>
+      <Control name="lblGLaccount" text="会计总账"/>
       <Control name="lblFileNo" text="文件号"/>
       <Control name="btnQuery" text="查询"/>
       <Control name="btnDetail" text="明细"/>
@@ -1018,8 +1075,67 @@
       <Message name="messageError2" text="查询失败"/>
       <Message name="messageError3" text="保存失败"/>
     </Message>
+  </Form> 
+  <Form>
+    <!--备件DN收货明细-->
+    <Name>form_spare_dn_receive_detail</Name>
+    <Controls>
+      <Control name="form_spare_dn_receive_detail" text="明细"/>
+      <Control name="columnHeader1" text="行项目"/>
+      <Control name="columnHeader2" text="PO单号"/>
+      <Control name="columnHeader3" text="物料编码"/>
+      <Control name="columnHeader4" text="数量"/>
+      <Control name="columnHeader5" text="库位"/>
+      <Control name="columnHeader6" text="容器码"/>
+      <Control name="btnReturn" text="返回"/>
+    </Controls>
+    <Message>
+      <Message name="messageSuccess1" text="保存成功"/>
+      <Message name="messageError1" text="网络不稳定，请重试"/>
+      <Message name="messageError2" text="查询失败"/>
+      <Message name="messageError3" text="保存失败"/>
+    </Message>
   </Form>
-
+  <Form>
+    <!--备件DN收货-->
+    <Name>form_spare_dn_receive</Name>
+    <Controls>
+      <Control name="form_spare_dn_receive" text="备件DN收货"/>
+      <Control name="lblPoNo" text="PO单号"/>
+      <Control name="lblDNNo" text="DN单号"/>
+      <Control name="lblMaterialCode" text="物料编码"/>
+      <Control name="lable1" text="物料名称"/>
+      <Control name="label2" text="需求"/>
+      <Control name="label3" text="累计"/>
+      <Control name="lblLocationCode" text="库位"/>
+      <Control name="lblAmount" text="数量"/>
+      <Control name="btnAdd" text="添加"/>
+      <Control name="columnHeader1" text="物料编码"/>
+      <Control name="columnHeader2" text="库位"/>
+      <Control name="columnHeader3" text="数量"/>
+      <Control name="columnHeader4" text="行项目"/>
+      <Control name="columnHeader5" text="PO单号"/>
+      <Control name="btnDetail" text="收货明细"/>
+      <Control name="btnConfirm" text="提交"/>
+      <Control name="btnDelete" text="删除"/>
+      <Control name="btnSearch" text="查询"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="请选择物料"/>
+      <Message name="message2" text="请选择库位"/>
+      <Message name="message3" text="请输入本次数量"/>
+      <Message name="message4" text="只允许输入正整数和小数"/>
+      <Message name="message5" text="DN收货未完成"/>
+      <Message name="message6" text="请输入DN单号"/>
+      <Message name="message8" text="同一库位只能添加一次"/>
+      <Message name="message9" text="添加的库位SAP库位只能相同"/>
+      <Message name="messageSuccess1" text="保存成功"/>
+      <Message name="messageError1" text="网络不稳定，请重试"/>
+      <Message name="messageError2" text="查询失败"/>
+      <Message name="messageError3" text="保存失败"/>
+    </Message>
+  </Form>
+  
   <Form>
     <!--海外DN收货-->
     <Name>form_import_dn_receive</Name>
@@ -1276,10 +1392,12 @@
       <Control name="lblSupplyCode" text="供应商"/>
       <Control name="lblLocationCode" text="库位"/>
       <Control name="lblNowAmount" text="本次数量"/>
+      <Control name="lblHeaderText" text="备注"/>
       <Control name="columnHeader1" text="物料编码"/>
       <Control name="columnHeader2" text="库位"/>
       <Control name="columnHeader3" text="数量"/>
       <Control name="columnHeader4" text="行项目"/>
+      <Control name="columnHeader5" text="备注"/>
       <Control name="btnAdd" text="添加"/>
       <Control name="btnDelete" text="删除"/>
       <Control name="btnConfirm" text="确认"/>
@@ -1296,6 +1414,7 @@
       <Message name="message8" text="同一库位只能添加一次"/>
       <Message name="message9" text="添加的库位SAP库位只能相同"/>
       <Message name="message10" text="提示"/>
+      <Message name="message11" text="请输入备注"/>
       <Message name="messageSuccess1" text="保存成功"/>
       <Message name="messageError1" text="网络不稳定，请重试"/>
       <Message name="messageError2" text="查询失败"/>
@@ -1639,14 +1758,14 @@
     <Name>form_DN_delivergoods_detail</Name>
     <Controls>
       <Control name="form_DN_delivergoods_detail" text="DN发货明细"/>
-      <Control name="columnHeader8" text="序号"/>
-      <Control name="columnHeader1" text="DN单号"/>
-      <Control name="columnHeader2" text="型号编码"/>
-      <Control name="columnHeader3" text="型号名称"/>
-      <Control name="columnHeader4" text="行项目"/>
-      <Control name="columnHeader5" text="条码号"/>
-      <Control name="columnHeader6" text="库位"/>
-      <Control name="columnHeader7" text="扫描时间"/>
+      <Control name="columnHeader1" text="序号"/>
+      <Control name="columnHeader2" text="DN单号"/>
+      <Control name="columnHeader3" text="型号编码"/>
+      <Control name="columnHeader4" text="型号名称"/>
+      <Control name="columnHeader5" text="行项目"/>
+      <Control name="columnHeader6" text="条码号"/>
+      <Control name="columnHeader7" text="库位"/>
+      <Control name="columnHeader8" text="扫描时间"/>
       <Control name="btnBack" text="返回"/>
     </Controls>
     <Message>
@@ -2863,4 +2982,167 @@
     </Message>
   </Form>
 
+  <Form>
+    <!--309物料转换-->
+    <Name>material_conversion_309</Name>
+    <Controls>
+      <Control name="material_conversion_309" text="309物料转换"/>
+      <Control name="lblOrderNo" text="单号"/>
+      <Control name="lblProductCode" text="原物料号"/>
+      <Control name="lblProductDescZh" text="物料描述"/>
+      <Control name="lblRoductCodeTarget" text="目标物料"/>
+      <Control name="lblProductDescZhTarget" text="物料描述"/>
+      <Control name="lblQty" text="计划数量"/>
+      <Control name="lblOriginWl" text="原库位"/>
+      <Control name="lblActualQty" text="数量"/>
+      <Control name="lblHeaderText" text="备注"/>
+
+      <Control name="btnQueryBarcode" text="查询"/>
+      <Control name="btnReturn" text="返回"/>
+      <Control name="btnConfirm" text="确认"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="请输入单号"/>
+      <Message name="message2" text="请输入数量"/>
+      <Message name="message3" text="请输入备注"/>
+      <Message name="messageError1" text="网络不稳定，请重试"/>
+      <Message name="messageError2" text="查询失败"/>
+      <Message name="messageError3" text="保存失败"/>
+    </Message>
+  </Form>
+  <Form>
+    <!--调拨出库-->
+    <Name>transfer_issue</Name>
+    <Controls>
+      <Control name="transfer_issue" text="调拨出库"/>
+      <Control name="lblStoNo" text="订单号"/>
+      <Control name="lblMaterialCode" text="物料编码"/>
+      <Control name="lblMaterialDesc" text="物料描述"/>
+      <Control name="lblDeliveryFactory" text="源工厂"/>
+      <Control name="lblDeliveryWlcode" text="源库位"/>
+      <Control name="lblReceiveFactory" text="目标工厂"/>
+      <Control name="lblReceiveWlcode" text="目标库位"/>
+      <Control name="lblOrderAmount" text="计划数量"/>
+      <Control name="btnQuery" text="查询"/>
+      <Control name="btnReturn" text="返回"/>
+      <Control name="btnConfirm" text="确认"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="请输入订单号"/>
+      <Message name="message2" text="请选择物料"/>
+      <Message name="message3" text="请输入本次数量"/>
+      <Message name="message4" text="只允许输入正整数和小数"/>
+      <Message name="message5" text="本次数量不能大于总数"/>
+      <Message name="message6" text="该单号不存在或已经操作完"/>
+      <Message name="messageSuccess1" text="保存成功"/>
+      <Message name="messageError1" text="网络不稳定，请重试"/>
+      <Message name="messageError2" text="查询失败"/>
+      <Message name="messageError3" text="保存失败"/>
+    </Message>
+  </Form>
+  <Form>
+    <!--调拨入库-->
+    <Name>transfer_receipt</Name>
+    <Controls>
+      <Control name="transfer_receipt" text="调拨入库"/>
+      <Control name="lblStoNo" text="订单号"/>
+      <Control name="lblMaterialCode" text="物料编码"/>
+      <Control name="lblMaterialDesc" text="物料描述"/>
+      <Control name="lblDeliveryFactory" text="源工厂"/>
+      <Control name="lblDeliveryWlcode" text="源库位"/>
+      <Control name="lblReceiveFactory" text="目标工厂"/>
+      <Control name="lblReceiveWlcode" text="目标库位"/>
+      <Control name="lblOrderAmount" text="计划数量"/>
+      <Control name="btnQuery" text="查询"/>
+      <Control name="btnReturn" text="返回"/>
+      <Control name="btnConfirm" text="确认"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="请输入订单号"/>
+      <Message name="message2" text="请选择物料"/>
+      <Message name="message3" text="请输入本次数量"/>
+      <Message name="message4" text="只允许输入正整数和小数"/>
+      <Message name="message5" text="本次数量不能大于总数"/>
+      <Message name="message6" text="该单号不存在或已经操作完"/>
+      <Message name="messageSuccess1" text="保存成功"/>
+      <Message name="messageError1" text="网络不稳定，请重试"/>
+      <Message name="messageError2" text="查询失败"/>
+      <Message name="messageError3" text="保存失败"/>
+    </Message>
+  </Form>
+  <Form>
+    <!--BOM关系外生产扣料-->
+    <Name>material_relationship_Y01</Name>
+    <Controls>
+      <Control name="material_relationship_Y01" text="BOM关系外生产扣料"/>
+      <Control name="lblOrderNo" text="单号"/>
+      <Control name="lblProductCode" text="原物料号"/>
+      <Control name="lblProductDescZh" text="物料描述"/>
+      <Control name="lblRoductCodeTarget" text="目标物料"/>
+      <Control name="lblProductDescZhTarget" text="物料描述"/>
+      <Control name="lblQty" text="计划数量"/>
+      <Control name="lblOriginWl" text="原库位"/>
+      <Control name="lblActualQty" text="数量"/>
+
+      <Control name="btnQueryBarcode" text="查询"/>
+      <Control name="btnReturn" text="返回"/>
+      <Control name="btnConfirm" text="确认"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="请输入单号"/>
+      <Message name="message2" text="请输入数量"/>
+      <Message name="messageError1" text="网络不稳定，请重试"/>
+      <Message name="messageError2" text="查询失败"/>
+      <Message name="messageError3" text="保存失败"/>
+    </Message>
+  </Form>
+  <Form>
+    <!--原材料补料-->
+    <Name>fictitious_append_mat</Name>
+    <Controls>
+      <Control name="fictitious_append_mat" text="虚拟补料"/>
+      <Control name="lblPrdOrder" text="订单号"/>
+      <Control name="btnSearch" text="查询"/>
+      <Control name="lblMaterialCode" text="物料编码"/>
+      <Control name="lblMaterialDesc" text="物料描述"/>
+      <Control name="lblRequestQty" text="需求数量"/>
+      <Control name="lblAppendedQty" text="已补数量"/>
+      <Control name="lblSendSpot" text="库存地点"/>
+      <Control name="lblTotalQty" text="累计数量"/>
+      <Control name="lblQueryLoc" text="查询"/>
+      <Control name="lblLocationCode" text="库位"/>
+      <Control name="lblNowQty" text="本次数量"/>
+      <Control name="columnHeader21" text="物料编码"/>
+      <Control name="columnHeader22" text="库位"/>
+      <Control name="columnHeader23" text="数量"/>
+      <Control name="columnHeader24" text="库存地点"/>
+      <Control name="lblLoginName" text="补料人"/>
+      <Control name="lblRfPwd" text="口令"/>
+      <Control name="btnAdd" text="添加"/>
+      <Control name="btnDelete" text="删除"/>
+      <Control name="btnConfirm" text="提交"/>
+      <Control name="btnDetail" text="明细"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="只允许输入正整数和小数"/>
+      <Message name="message2" text="本次补料数量不能小于零"/>
+      <Message name="message3" text="请输入订单号"/>
+      <Message name="message4" text="请选择想要修改的数据"/>
+      <Message name="message5" text="请选择想要保存的数据"/>
+      <Message name="message6" text="请选择库位"/>
+      <Message name="message7" text="请选择要查看的数据"/>
+      <Message name="message8" text="同一库位只能添加一次"/>
+      <Message name="message9" text="添加的库位SAP库位只能相同"/>
+      <Message name="message10" text="请添加库位和数量"/>
+      <Message name="message11" text="请输入补料人"/>
+      <Message name="message12" text="请输入密码"/>
+      <Message name="message13" text="该物料库存不足"/>
+      <Message name="message14" text="历史订单解锁失败，请重新操作"/>
+      <Message name="messageSuccess1" text="保存成功"/>
+      <Message name="messageError1" text="网络不稳定，请重试"/>
+      <Message name="messageError2" text="查询失败"/>
+      <Message name="messageError3" text="保存失败"/>
+    </Message>
+  </Form>
+
 </Softimite>
diff --git a/docker_file/seamom_package/apk/Debug/languages/English.xml b/docker_file/seamom_package/apk/Debug/languages/English.xml
index e7e6bcd..a0f6fc7 100644
--- a/docker_file/seamom_package/apk/Debug/languages/English.xml
+++ b/docker_file/seamom_package/apk/Debug/languages/English.xml
@@ -147,6 +147,12 @@
       <Control name="btnSpareUpShelf" text="Spare Up Shelf"/>
       <Control name="btnSpareDownShelf" text="Spare Down Shelf"/>
       <Control name="btnSpareGoodsIssue" text="Spare Goods Issue"/>
+      <Control name="butMaterialConversion309" text="309"/>
+      <Control name="butMaterialRelationshipY01" text="Y01"/>
+      <Control name="butFictitiousAppendMat" text="Virtual Append Mat"/>
+      <Control name="butTransferIssue" text="301 Issue"/>
+      <Control name="butTransferReceipt" text="301 Receipt"/>
+      <Control name="btnSpareDNReceive" text="Spare Part Dn"/>
     </Controls>
     <Message>
       <Message name="messageSuccess1" text="Save Success"/>
@@ -254,7 +260,56 @@
       <Message name="messageError3" text="Save failed"/>
     </Message>
   </Form>
-
+  
+  <Form>
+    <!--原材料补料-->
+    <Name>fictitious_append_mat</Name>
+    <Controls>
+      <Control name="form_append_mat" text="Append Mat"/>
+      <Control name="lblPrdOrder" text="Order No"/>
+      <Control name="btnSearch" text="Query"/>
+      <Control name="lblMaterialCode" text="MAT CODE"/>
+      <Control name="lblMaterialDesc" text="MAT DESC"/>
+      <Control name="lblRequestQty" text="Request"/>
+      <Control name="lblAppendedQty" text="Appended"/>
+      <Control name="lblSendSpot" text="Send Spot"/>
+      <Control name="lblTotalQty" text="Total"/>
+      <Control name="lblQueryLoc" text="Query"/>
+      <Control name="lblLocationCode" text="Loc"/>
+      <Control name="lblNowQty" text="Now Qty"/>
+      <Control name="columnHeader21" text="MAT CODE"/>
+      <Control name="columnHeader22" text="Loc"/>
+      <Control name="columnHeader23" text="Qty"/>
+      <Control name="columnHeader24" text="Send Spot"/>
+      <Control name="lblLoginName" text="Appender"/>
+      <Control name="lblRfPwd" text="pwd"/>
+      <Control name="btnAdd" text="Add"/>
+      <Control name="btnDelete" text="Delete"/>
+      <Control name="btnConfirm" text="Confirm"/>
+      <Control name="btnDetail" text="Detail"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="Only positive integers and decimals are allowed"/>
+      <Message name="message2" text="Amount cannot be less than 0"/>
+      <Message name="message3" text="Please input order No"/>
+      <Message name="message4" text="Please select a Data to modify"/>
+      <Message name="message5" text="Please select a Data to save"/>
+      <Message name="message6" text="Please select a Loc"/>
+      <Message name="message7" text="Please select a Data"/>
+      <Message name="message8" text="The same Loc can only be added once"/>
+      <Message name="message9" text="The sapLoc  of the added Loc must be the same"/>
+      <Message name="message10" text="Please add Loc and qty"/>
+      <Message name="message11" text="Please input appender"/>
+      <Message name="message12" text="Please input pwd"/>
+      <Message name="message13" text="The MAT does not exist in stock"/>
+      <Message name="message14" text="Failed to unlock the historical order. Please operate again"/>
+      <Message name="messageSuccess1" text="Save Success"/>
+      <Message name="messageError1" text="Internet Error"/>
+      <Message name="messageError2" text="Query failed"/>
+      <Message name="messageError3" text="Save failed"/>
+    </Message>
+  </Form>
+  
   <Form>
     <!--原材料补料-->
     <Name>form_append_mat_detail</Name>
@@ -783,6 +838,7 @@
       <Control name="lblOriginWl" text="Origin WL"/>
       <Control name="lblAimWl" text="Aim WL"/>
       <Control name="lblCostCenter" text="Cost Center"/>
+      <Control name="lblGLaccount" text="GL Account"/>
       <Control name="lblFileNo" text="File No"/>
       <Control name="btnQuery" text="Query"/>
       <Control name="btnDetail" text="Detail"/>
@@ -1019,6 +1075,68 @@
       <Message name="messageError3" text="Save failed"/>
     </Message>
   </Form>
+  
+  <Form>
+    <!--备件DN收货-->
+    <Name>form_spare_dn_receive</Name>
+    <Controls>
+      <Control name="form_spare_dn_receive" text="Spare Part DN Receive"/>
+      <Control name="lblPoNo" text="PO No"/>
+      <Control name="lblDNNo" text="DN No"/>
+      <Control name="lblMaterialCode" text="MAT CODE"/>
+      <Control name="lable1" text="MAT DESC"/>
+      <Control name="label2" text="Request Qty"/>
+      <Control name="label3" text="Sum Qty"/>
+      <Control name="lblLocationCode" text="Loc"/>
+      <Control name="lblAmount" text="Qty"/>
+      <Control name="btnAdd" text="Add"/>
+      <Control name="columnHeader1" text="MAT CODE"/>
+      <Control name="columnHeader2" text="Loc"/>
+      <Control name="columnHeader3" text="Qty"/>
+      <Control name="columnHeader4" text="Row Item"/>
+      <Control name="columnHeader5" text="PO No"/>
+      <Control name="btnDetail" text="Detial"/>
+      <Control name="btnConfirm" text="Submit"/>
+      <Control name="btnDelete" text="Delete"/>
+      <Control name="btnSearch" text="Search"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="Select MAT,please"/>
+      <Message name="message2" text="Select Loc,please"/>
+      <Message name="message3" text="Please input Qty"/>
+      <Message name="message4" text="Only positive integers and decimals are allowed"/>
+      <Message name="message5" text="DN receive not completed"/>
+      <Message name="message6" text="Input DN No,please"/>
+      <Message name="message8" text="The same Loc can only be added once"/>
+      <Message name="message9" text="The sapLoc  of the added Loc must be the same"/>
+      <Message name="messageSuccess1" text="Save Success"/>
+      <Message name="messageError1" text="Internet Error"/>
+      <Message name="messageError2" text="Query failed"/>
+      <Message name="messageError3" text="Save failed"/>
+    </Message>
+  </Form>
+
+
+  <Form>
+    <!--备件DN收货明细-->
+    <Name>form_spare_dn_receive_detail</Name>
+    <Controls>
+      <Control name="form_spare_dn_receive_detail" text="Detail"/>
+      <Control name="columnHeader1" text="Row Item"/>
+      <Control name="columnHeader2" text="PO No"/>
+      <Control name="columnHeader3" text="MAT CODE"/>
+      <Control name="columnHeader4" text="Qty"/>
+      <Control name="columnHeader5" text="Loc"/>
+      <Control name="columnHeader6" text="Pallet Code"/>
+      <Control name="btnReturn" text="Return"/>
+    </Controls>
+    <Message>
+      <Message name="messageSuccess1" text="Save Success"/>
+      <Message name="messageError1" text="Internet Error"/>
+      <Message name="messageError2" text="Query failed"/>
+      <Message name="messageError3" text="Save failed"/>
+    </Message>
+  </Form>
 
   <Form>
     <!--海外DN收货-->
@@ -1276,10 +1394,12 @@
       <Control name="lblSupplyCode" text="Supplier"/>
       <Control name="lblLocationCode" text="Loc"/>
       <Control name="lblNowAmount" text="Amount"/>
+      <Control name="lblHeaderText" text="Header"/>
       <Control name="columnHeader1" text="MAT CODE"/>
       <Control name="columnHeader2" text="Loc"/>
       <Control name="columnHeader3" text="Amount"/>
       <Control name="columnHeader4" text="Item"/>
+      <Control name="columnHeader5" text="HeaderText"/>
       <Control name="btnAdd" text="Add"/>
       <Control name="btnDelete" text="Delete"/>
       <Control name="btnConfirm" text="Confirm"/>
@@ -1296,6 +1416,7 @@
       <Message name="message8" text="The same Loc can only be added once"/>
       <Message name="message9" text="The sapLoc  of the added Loc must be the same"/>
       <Message name="message10" text="Message"/>
+      <Message name="message11" text="Please input Header Text"/>
       <Message name="messageSuccess1" text="Save Success"/>
       <Message name="messageError1" text="Internet Error"/>
       <Message name="messageError2" text="Query failed"/>
@@ -1639,14 +1760,14 @@
     <Name>form_DN_delivergoods_detail</Name>
     <Controls>
       <Control name="form_DN_delivergoods_detail" text="DN delivergoods detail"/>
-      <Control name="columnHeader8" text="No."/>
-      <Control name="columnHeader1" text="DN No"/>
-      <Control name="columnHeader2" text="FG CODE"/>
-      <Control name="columnHeader3" text="FG DESC"/>
-      <Control name="columnHeader4" text="Item No"/>
-      <Control name="columnHeader5" text="Barcode"/>
-      <Control name="columnHeader6" text="Loc"/>
-      <Control name="columnHeader7" text="Scan Time"/>
+      <Control name="columnHeader1" text="No."/>
+      <Control name="columnHeader2" text="DN No"/>
+      <Control name="columnHeader3" text="FG CODE"/>
+      <Control name="columnHeader4" text="FG DESC"/>
+      <Control name="columnHeader5" text="Item No"/>
+      <Control name="columnHeader6" text="Barcode"/>
+      <Control name="columnHeader7" text="Loc"/>
+      <Control name="columnHeader8" text="Scan Time"/>
       <Control name="btnBack" text="Return"/>
     </Controls>
     <Message>
@@ -2861,5 +2982,174 @@
       <Message name="messageError3" text="Save failed"/>
     </Message>
   </Form>
+  <Form>
+    <!--309物料转换-->
+    <Name>material_conversion_309</Name>
+    <Controls>
+      <Control name="material_conversion_309" text="309Material conversion"/>
+      <Control name="lblOrderNo" text="Order No"/>
+      <Control name="lblProductCode" text="Original material"/>
+      <Control name="lblProductDescZh" text="Raw material des"/>
+      <Control name="lblRoductCodeTarget" text="Target material"/>
+      <Control name="lblProductDescZhTarget" text="Target material des"/>
+      <Control name="lblQty" text="Plan QTY"/>
+      <Control name="lblOriginWl" text="Original Loc"/>
+      <Control name="lblActualQty" text="Qty"/>
+      <Control name="lblHeaderText" text="HeaderText"/>
+
+      <Control name="btnQueryBarcode" text="Query"/>
+      <Control name="btnReturn" text="Return"/>
+      <Control name="btnConfirm" text="Confirm"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="Please input Order No"/>
+      <Message name="message2" text="Please input the Qty"/>
+      <Message name="message3" text="Please input HeaderText"/>
+      <Message name="messageSuccess1" text="Save Success"/>
+      <Message name="messageError1" text="Internet Error"/>
+      <Message name="messageError2" text="Query failed"/>
+      <Message name="messageError3" text="Save failed"/>
+    </Message>
+  </Form>
+  <Form>
+    <!--调拨出库-->
+    <Name>transfer_issue</Name>
+    <Controls>
+      <Control name="transfer_issue" text="Transfer Issue"/>
+      <Control name="lblStoNo" text="Order No"/>
+      <Control name="lblMaterialCode" text="Mat Code"/>
+      <Control name="lblMaterialDesc" text="Mat Desc"/>
+      
+      <Control name="lblDeliveryFactory" text="Origin factory"/>
+      <Control name="lblDeliveryWlcode" text="Origin WL"/>
+      <Control name="lblReceiveFactory" text="Target factory"/>
+      <Control name="lblReceiveWlcode" text="Target Station"/>
+      <Control name="lblOrderAmount" text="Amount"/>
+      
+      <Control name="btnQuery" text="Query"/>
+      <Control name="btnReturn" text="Return"/>
+      <Control name="btnConfirm" text="Confirm"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="Please input Order No"/>
+      <Message name="message2" text="Please select Mat Code"/>
+      <Message name="message3" text="Please input Amount"/>
+      <Message name="message4" text="Only positive integers and decimals are allowed"/>
+      <Message name="message5" text="本次数量不能大于总数"/>
+      <Message name="message6" text="The order No does not exist or the operation has been completed"/>
+      <Message name="messageSuccess1" text="Save Success"/>
+      <Message name="messageError1" text="Internet Error"/>
+      <Message name="messageError2" text="Query failed"/>
+      <Message name="messageError3" text="Save failed"/>
+    </Message>
+  </Form>
+  <Form>
+    <!--调拨入库-->
+    <Name>transfer_receipt</Name>
+    <Controls>
+      <Control name="transfer_receipt" text="Transfer Receipt"/>
+      <Control name="lblStoNo" text="Order No"/>
+      <Control name="lblMaterialCode" text="Mat Code"/>
+      <Control name="lblMaterialDesc" text="Mat Desc"/>
+
+      <Control name="lblDeliveryFactory" text="Origin factory"/>
+      <Control name="lblDeliveryWlcode" text="Origin WL"/>
+      <Control name="lblReceiveFactory" text="Target factory"/>
+      <Control name="lblReceiveWlcode" text="Target Station"/>
+      <Control name="lblOrderAmount" text="Amount"/>
+
+      <Control name="btnQuery" text="Query"/>
+      <Control name="btnReturn" text="Return"/>
+      <Control name="btnConfirm" text="Confirm"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="Please input Order No"/>
+      <Message name="message2" text="Please select Mat Code"/>
+      <Message name="message3" text="Please input Amount"/>
+      <Message name="message4" text="Only positive integers and decimals are allowed"/>
+      <Message name="message5" text="本次数量不能大于总数"/>
+      <Message name="message6" text="The order No does not exist or the operation has been completed"/>
+      <Message name="messageSuccess1" text="Save Success"/>
+      <Message name="messageError1" text="Internet Error"/>
+      <Message name="messageError2" text="Query failed"/>
+      <Message name="messageError3" text="Save failed"/>
+    </Message>
+  </Form>
+  <Form>
+    <!--BOM关系外生产扣料-->
+    <Name>material_relationship_Y01</Name>
+    <Controls>
+      <Control name="material_relationship_Y01" text="External Mat"/>
+      <Control name="lblOrderNo" text="Order No"/>
+      <Control name="lblProductCode" text="Original material"/>
+      <Control name="lblProductDescZh" text="Raw material des"/>
+      <Control name="lblRoductCodeTarget" text="Target material"/>
+      <Control name="lblProductDescZhTarget" text="Target material des"/>
+      <Control name="lblQty" text="Plan QTY"/>
+      <Control name="lblOriginWl" text="Original Loc"/>
+      <Control name="lblActualQty" text="Qty"/>
+
+      <Control name="btnQueryBarcode" text="Query"/>
+      <Control name="btnReturn" text="Return"/>
+      <Control name="btnConfirm" text="Confirm"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="Please input Order No"/>
+      <Message name="message2" text="Please input the Qty"/>
+      <Message name="message3" text="Please select one data to delete"/>
+      <Message name="messageSuccess1" text="Save Success"/>
+      <Message name="messageError1" text="Internet Error"/>
+      <Message name="messageError2" text="Query failed"/>
+      <Message name="messageError3" text="Save failed"/>
+    </Message>
+  </Form>
+  <Form>
+    <!--原材料补料-->
+    <Name>fictitious_append_mat</Name>
+    <Controls>
+      <Control name="fictitious_append_mat" text="Virtual replenishment"/>
+      <Control name="lblPrdOrder" text="Order No"/>
+      <Control name="btnSearch" text="Query"/>
+      <Control name="lblMaterialCode" text="MAT CODE"/>
+      <Control name="lblMaterialDesc" text="MAT DESC"/>
+      <Control name="lblRequestQty" text="Request"/>
+      <Control name="lblAppendedQty" text="Appended"/>
+      <Control name="lblSendSpot" text="Send Spot"/>
+      <Control name="lblTotalQty" text="Total"/>
+      <Control name="lblQueryLoc" text="Query"/>
+      <Control name="lblLocationCode" text="Loc"/>
+      <Control name="lblNowQty" text="Now Qty"/>
+      <Control name="columnHeader21" text="MAT CODE"/>
+      <Control name="columnHeader22" text="Loc"/>
+      <Control name="columnHeader23" text="Qty"/>
+      <Control name="columnHeader24" text="Send Spot"/>
+      <Control name="lblLoginName" text="Appender"/>
+      <Control name="lblRfPwd" text="pwd"/>
+      <Control name="btnAdd" text="Add"/>
+      <Control name="btnDelete" text="Delete"/>
+      <Control name="btnConfirm" text="Confirm"/>
+      <Control name="btnDetail" text="Detail"/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="Only positive integers and decimals are allowed"/>
+      <Message name="message2" text="Amount cannot be less than 0"/>
+      <Message name="message3" text="Please input order No"/>
+      <Message name="message4" text="Please select a Data to modify"/>
+      <Message name="message5" text="Please select a Data to save"/>
+      <Message name="message6" text="Please select a Loc"/>
+      <Message name="message7" text="Please select a Data"/>
+      <Message name="message8" text="The same Loc can only be added once"/>
+      <Message name="message9" text="The sapLoc  of the added Loc must be the same"/>
+      <Message name="message10" text="Please add Loc and qty"/>
+      <Message name="message11" text="Please input appender"/>
+      <Message name="message12" text="Please input pwd"/>
+      <Message name="message13" text="The MAT does not exist in stock"/>
+      <Message name="message14" text="Failed to unlock the historical order. Please operate again"/>
+      <Message name="messageSuccess1" text="Save Success"/>
+      <Message name="messageError1" text="Internet Error"/>
+      <Message name="messageError2" text="Query failed"/>
+      <Message name="messageError3" text="Save failed"/>
+    </Message>
+  </Form>
 
 </Softimite>
diff --git a/docker_file/seamom_package/apk/Debug/languages/Russian.xml b/docker_file/seamom_package/apk/Debug/languages/Russian.xml
index d4376e2..0964a27 100644
--- a/docker_file/seamom_package/apk/Debug/languages/Russian.xml
+++ b/docker_file/seamom_package/apk/Debug/languages/Russian.xml
@@ -246,6 +246,54 @@
       <Message name="messageError3" text="Ошибка запроса" />
     </Message>
   </Form>
+  <Form>
+    <!--原材料补料-->
+    <Name>fictitious_append_mat</Name>
+    <Controls>
+      <Control name="form_append_mat" text="подача" />
+      <Control name="lblPrdOrder" text="номер заказа" />
+      <Control name="btnSearch" text="Запрос" />
+      <Control name="lblMaterialCode" text="Кодировка материала" />
+      <Control name="lblMaterialDesc" text="описание товара" />
+      <Control name="lblRequestQty" text="необходимое количество" />
+      <Control name="lblAppendedQty" text="Заполненное количество" />
+      <Control name="lblSendSpot" text="Расположение инвентаря" />
+      <Control name="lblTotalQty" text="Суммарное количество" />
+      <Control name="lblQueryLoc" text="Запрос" />
+      <Control name="lblLocationCode" text="Место нахождения" />
+      <Control name="lblNowQty" text="Число этого времени" />
+      <Control name="columnHeader21" text="Кодировка материала" />
+      <Control name="columnHeader22" text="Место нахождения" />
+      <Control name="columnHeader23" text="количество" />
+      <Control name="columnHeader24" text="Расположение инвентаря" />
+      <Control name="lblLoginName" text="Лицо, ответственное за допоставку" />
+      <Control name="lblRfPwd" text="пароль" />
+      <Control name="btnAdd" text="Добавить " />
+      <Control name="btnDelete" text="удалить" />
+      <Control name="btnConfirm" text="Отправить" />
+      <Control name="btnDetail" text="Подробности" />
+    </Controls>
+    <Message>
+      <Message name="message1" text="Допускаются только положительные целые числа и десятичные дроби." />
+      <Message name="message2" text="Количество этой допоставки не может быть меньше нуля" />
+      <Message name="message3" text="Пожалуйста, введите номер заказа" />
+      <Message name="message4" text="Пожалуйста, выберите данные, которые вы хотите изменить" />
+      <Message name="message5" text="Пожалуйста, выберите данные, которые вы хотите сохранить" />
+      <Message name="message6" text="Пожалуйста, выберите местоположение" />
+      <Message name="message7" text="Выберите данные для просмотра" />
+      <Message name="message8" text="Одно и то же место можно добавить только один раз" />
+      <Message name="message9" text="Местонахождение складского места SAP может быть только одним и тем же." />
+      <Message name="message10" text="Добавленное местонахождение складского места " />
+      <Message name="message11" text="Пожалуйста, укажите местоположение и количество" />
+      <Message name="message12" text="Пожалуйста, введите лицо, ответственное за допоставку" />
+      <Message name="message13" text="Пожалуйста введите пароль" />
+      <Message name="message14" text="" />
+      <Message name="messageSuccess1" text="Товара нет в наличии" />
+      <Message name="messageError1" text="Успешно сохранено" />
+      <Message name="messageError2" text="Сеть нестабильна, попробуйте еще раз" />
+      <Message name="messageError3" text="Ошибка запроса" />
+    </Message>
+  </Form>
   <Form>
     <!--原材料补料-->
     <Name>form_append_mat_detail</Name>
@@ -758,6 +806,7 @@
       <Control name="lblOriginWl" text="местоположение источника" />
       <Control name="lblAimWl" text="целевое местоположение" />
       <Control name="lblCostCenter" text="Центр готовой продукции" />
+      <Control name="lblGLaccount" text="Центр готовой продукции" />
       <Control name="lblFileNo" text="Номер документа" />
       <Control name="btnQuery" text="Запрос" />
       <Control name="btnDetail" text="Подробности" />
@@ -985,6 +1034,66 @@
       <Message name="messageError3" text="Не удалось сохранить" />
     </Message>
   </Form>
+  
+  <Form>
+    <!--备件DN收货-->
+    <Name>form_spare_dn_receive</Name>
+    <Controls>
+      <Control name="form_spare_dn_receive" text="Получение товара DN на месте " />
+      <Control name="lblPoNo" text="Номер отслеживания РО" />
+      <Control name="lblDNNo" text="номер отслеживания DN" />
+      <Control name="lblMaterialCode" text="Кодировка материала" />
+      <Control name="lable1" text="Название материала" />
+      <Control name="label2" text="потребность" />
+      <Control name="label3" text="общий итог" />
+      <Control name="lblLocationCode" text="Место нахождения" />
+      <Control name="lblAmount" text="количество" />
+      <Control name="btnAdd" text="Добавить" />
+      <Control name="columnHeader1" text="Кодировка материала" />
+      <Control name="columnHeader2" text="Место нахождения" />
+      <Control name="columnHeader3" text="количество" />
+      <Control name="columnHeader4" text="позиция" />
+      <Control name="columnHeader5" text="Номер отслеживания РО" />
+      <Control name="btnDetail" text="Детали получения" />
+      <Control name="btnConfirm" text="Отправить" />
+      <Control name="btnDelete" text="Удалить" />
+      <Control name="btnSearch" text="Запрос" />
+    </Controls>
+    <Message>
+      <Message name="message1" text="Пожалуйста, выберите материал" />
+      <Message name="message2" text="Пожалуйста, выберите местоположение" />
+      <Message name="message3" text="Пожалуйста, введите это количество" />
+      <Message name="message4" text="Допускаются только положительные целые числа и десятичные дроби." />
+      <Message name="message5" text="Накладная DN не заполнена" />
+      <Message name="message6" text="Пожалуйста, введите номер отслеживания DN" />
+      <Message name="message8" text="Одно и то же место можно добавить только один раз" />
+      <Message name="message9" text="Добавленное местонахождение складского места SAP может быть только одним и тем же." />
+      <Message name="messageSuccess1" text="Успешно сохранено" />
+      <Message name="messageError1" text="Сеть нестабильна, попробуйте еще раз" />
+      <Message name="messageError2" text="Ошибка запроса" />
+      <Message name="messageError3" text="Не удалось сохранить" />
+    </Message>
+  </Form>
+  <Form>
+    <!--备件DN收货明细-->
+    <Name>form_spare_dn_receive_detail</Name>
+    <Controls>
+      <Control name="form_spare_dn_receive_detail" text="Сведения о получении локального DN" />
+      <Control name="columnHeader1" text="позиция" />
+      <Control name="columnHeader2" text="Номер отслеживания РО" />
+      <Control name="columnHeader3" text="Кодировка материала" />
+      <Control name="columnHeader4" text="количество" />
+      <Control name="columnHeader5" text="Место нахождения" />
+      <Control name="columnHeader6" text="штрих-код" />
+      <Control name="btnReturn" text="возврат" />
+    </Controls>
+    <Message>
+      <Message name="messageSuccess1" text="Успешно сохранено" />
+      <Message name="messageError1" text="Сеть нестабильна, попробуйте еще раз" />
+      <Message name="messageError2" text="Ошибка запроса" />
+      <Message name="messageError3" text="Не удалось сохранить" />
+    </Message>
+  </Form>
   <Form>
     <!--海外DN收货-->
     <Name>form_import_dn_receive</Name>
@@ -1583,14 +1692,14 @@
     <Name>form_DN_delivergoods_detail</Name>
     <Controls>
       <Control name="form_DN_delivergoods_detail" text="Сведения о доставке DN" />
-      <Control name="columnHeader8" text="No." />
-      <Control name="columnHeader1" text="номер отслеживания DN" />
-      <Control name="columnHeader2" text="Код модели" />
-      <Control name="columnHeader3" text="Название модели" />
-      <Control name="columnHeader4" text="позиция" />
-      <Control name="columnHeader5" text="номер штрих-кода" />
-      <Control name="columnHeader6" text="Место нахождения" />
-      <Control name="columnHeader7" text="Время сканирования" />
+      <Control name="columnHeader1" text="No." />
+      <Control name="columnHeader2" text="номер отслеживания DN" />
+      <Control name="columnHeader3" text="Код модели" />
+      <Control name="columnHeader4" text="Название модели" />
+      <Control name="columnHeader5" text="позиция" />
+      <Control name="columnHeader6" text="номер штрих-кода" />
+      <Control name="columnHeader7" text="Место нахождения" />
+      <Control name="columnHeader8" text="Время сканирования" />
       <Control name="btnBack" text="возврат" />
     </Controls>
     <Message>
@@ -2777,5 +2886,173 @@
       <Message name="messageError3" text="Не удалось сохранить" />
     </Message>
   </Form>
+  <Form>
+    <!--309物料转换-->
+    <Name>material_conversion_309</Name>
+    <Controls>
+      <Control name="material_conversion_309" text="309конверсия материалов"/>
+      <Control name="lblOrderNo" text=""/>
+      <Control name="lblProductCode" text=""/>
+      <Control name="lblProductDescZh" text=""/>
+      <Control name="lblRoductCodeTarget" text=""/>
+      <Control name="lblProductDescZhTarget" text=""/>
+      <Control name="lblQty" text=""/>
+      <Control name="lblOriginWl" text=""/>
+      <Control name="lblActualQty" text=""/>
+
+      <Control name="btnQueryBarcode" text=""/>
+      <Control name="btnReturn" text=""/>
+      <Control name="btnConfirm" text=""/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="Пожалуйста, введите номер заказа" />
+      <Message name="message2" text="" />
+      <Message name="message3" text="" />
+      <Message name="messageSuccess1" text="" />
+      <Message name="messageError1" text="" />
+      <Message name="messageError2" text="" />
+      <Message name="messageError3" text="" />
+    </Message>
+  </Form>
+  <Form>
+    <!--调拨出库-->
+    <Name>transfer_issue</Name>
+    <Controls>
+      <Control name="transfer_issue" text="распределительный склад" />
+      <Control name="lblOrderNo" text="номер заказа" />
+      <Control name="lblMaterialCode" text="Кодировка материала" />
+      <Control name="lblMaterialDesc" text="описание товара" />
+      
+      <Control name="lblDeliveryFactory" text="первоначальный завод " />
+      <Control name="lblDeliveryWlcode" text="Входящее местоположение" />
+      <Control name="lblReceiveFactory" text="объектный завод " />
+      <Control name="lblReceiveWlcode" text="целевая станция" />
+      <Control name="lblOrderAmount" text="Число этого времени" />
+
+      <Control name="btnQuery" text="Запрос" />
+      <Control name="btnReturn" text="возврат" />
+      <Control name="btnConfirm" text="Продолжать" />
+    </Controls>
+    <Message>
+      <Message name="message1" text="Пожалуйста, введите номер заказа" />
+      <Message name="message2" text="Пожалуйста, выберите материал" />
+      <Message name="message3" text="Пожалуйста, введите это количество" />
+      <Message name="message4" text="Допускаются только положительные целые числа и десятичные дроби." />
+      <Message name="message5" text="Это число не может быть больше, чем общее" />
+      <Message name="message6" text="Номер заказа не существует или был использован" />
+      <Message name="messageSuccess1" text="Успешно сохранено" />
+      <Message name="messageError1" text="Сеть нестабильна, попробуйте еще раз" />
+      <Message name="messageError2" text="Ошибка запроса" />
+      <Message name="messageError3" text="Не удалось сохранить" />
+    </Message>
+  </Form>
+  <Form>
+    <!--调拨入库-->
+    <Name>transfer_receipt</Name>
+    <Controls>
+      <Control name="transfer_receipt" text="переброска на склад" />
+      <Control name="lblOrderNo" text="номер заказа" />
+      <Control name="lblMaterialCode" text="Кодировка материала" />
+      <Control name="lblMaterialDesc" text="описание товара" />
+
+      <Control name="lblDeliveryFactory" text="первоначальный завод " />
+      <Control name="lblDeliveryWlcode" text="Входящее местоположение" />
+      <Control name="lblReceiveFactory" text="объектный завод " />
+      <Control name="lblReceiveWlcode" text="целевая станция" />
+      <Control name="lblOrderAmount" text="Число этого времени" />
+
+      <Control name="btnQuery" text="Запрос" />
+      <Control name="btnReturn" text="возврат" />
+      <Control name="btnConfirm" text="Продолжать" />
+    </Controls>
+    <Message>
+      <Message name="message1" text="Пожалуйста, введите номер заказа" />
+      <Message name="message2" text="Пожалуйста, выберите материал" />
+      <Message name="message3" text="Пожалуйста, введите это количество" />
+      <Message name="message4" text="Допускаются только положительные целые числа и десятичные дроби." />
+      <Message name="message5" text="Это число не может быть больше, чем общее" />
+      <Message name="message6" text="Номер заказа не существует или был использован" />
+      <Message name="messageSuccess1" text="Успешно сохранено" />
+      <Message name="messageError1" text="Сеть нестабильна, попробуйте еще раз" />
+      <Message name="messageError2" text="Ошибка запроса" />
+      <Message name="messageError3" text="Не удалось сохранить" />
+    </Message>
+  </Form>
+  <Form>
+    <!--BOM关系外生产扣料-->
+    <Name>material_relationship_Y01</Name>
+    <Controls>
+      <Control name="material_relationship_Y01" text="производственные вычеты"/>
+      <Control name="lblOrderNo" text=""/>
+      <Control name="lblProductCode" text=""/>
+      <Control name="lblProductDescZh" text=""/>
+      <Control name="lblRoductCodeTarget" text=""/>
+      <Control name="lblProductDescZhTarget" text=""/>
+      <Control name="lblQty" text=""/>
+      <Control name="lblOriginWl" text=""/>
+      <Control name="lblActualQty" text=""/>
+
+      <Control name="btnQueryBarcode" text=""/>
+      <Control name="btnReturn" text=""/>
+      <Control name="btnConfirm" text=""/>
+    </Controls>
+    <Message>
+      <Message name="message1" text="Пожалуйста, введите номер заказа" />
+      <Message name="message2" text="" />
+      <Message name="message3" text="" />
+      <Message name="messageSuccess1" text="" />
+      <Message name="messageError1" text="" />
+      <Message name="messageError2" text="" />
+      <Message name="messageError3" text="" />
+    </Message>
+  </Form>
+  <Form>
+    <!--原材料补料-->
+    <Name>fictitious_append_mat</Name>
+    <Controls>
+      <Control name="fictitious_append_mat" text="виртуальная добавка" />
+      <Control name="lblPrdOrder" text="номер заказа" />
+      <Control name="btnSearch" text="Запрос" />
+      <Control name="lblMaterialCode" text="Кодировка материала" />
+      <Control name="lblMaterialDesc" text="описание товара" />
+      <Control name="lblRequestQty" text="необходимое количество" />
+      <Control name="lblAppendedQty" text="Заполненное количество" />
+      <Control name="lblSendSpot" text="Расположение инвентаря" />
+      <Control name="lblTotalQty" text="Суммарное количество" />
+      <Control name="lblQueryLoc" text="Запрос" />
+      <Control name="lblLocationCode" text="Место нахождения" />
+      <Control name="lblNowQty" text="Число этого времени" />
+      <Control name="columnHeader21" text="Кодировка материала" />
+      <Control name="columnHeader22" text="Место нахождения" />
+      <Control name="columnHeader23" text="количество" />
+      <Control name="columnHeader24" text="Расположение инвентаря" />
+      <Control name="lblLoginName" text="Лицо, ответственное за допоставку" />
+      <Control name="lblRfPwd" text="пароль" />
+      <Control name="btnAdd" text="Добавить " />
+      <Control name="btnDelete" text="удалить" />
+      <Control name="btnConfirm" text="Отправить" />
+      <Control name="btnDetail" text="Подробности" />
+    </Controls>
+    <Message>
+      <Message name="message1" text="Допускаются только положительные целые числа и десятичные дроби." />
+      <Message name="message2" text="Количество этой допоставки не может быть меньше нуля" />
+      <Message name="message3" text="Пожалуйста, введите номер заказа" />
+      <Message name="message4" text="Пожалуйста, выберите данные, которые вы хотите изменить" />
+      <Message name="message5" text="Пожалуйста, выберите данные, которые вы хотите сохранить" />
+      <Message name="message6" text="Пожалуйста, выберите местоположение" />
+      <Message name="message7" text="Выберите данные для просмотра" />
+      <Message name="message8" text="Одно и то же место можно добавить только один раз" />
+      <Message name="message9" text="Местонахождение складского места SAP может быть только одним и тем же." />
+      <Message name="message10" text="Добавленное местонахождение складского места " />
+      <Message name="message11" text="Пожалуйста, укажите местоположение и количество" />
+      <Message name="message12" text="Пожалуйста, введите лицо, ответственное за допоставку" />
+      <Message name="message13" text="Пожалуйста введите пароль" />
+      <Message name="message14" text="" />
+      <Message name="messageSuccess1" text="Товара нет в наличии" />
+      <Message name="messageError1" text="Успешно сохранено" />
+      <Message name="messageError2" text="Сеть нестабильна, попробуйте еще раз" />
+      <Message name="messageError3" text="Ошибка запроса" />
+    </Message>
+  </Form>
 
 </Softimite>
\ No newline at end of file
diff --git a/docker_file/seamom_package/apk/Debug/readme_wince.txt b/docker_file/seamom_package/apk/Debug/readme_wince.txt
index 3234dc3..c9e89f7 100644
--- a/docker_file/seamom_package/apk/Debug/readme_wince.txt
+++ b/docker_file/seamom_package/apk/Debug/readme_wince.txt
@@ -100,3 +100,6 @@
 --优化：原材料虚拟单展示界面新增虚拟库存数量列
 --优化：原材料移库默认数量为需求数量
 --修复：原材料虚拟单查询界面点击查询前清空旧数据
+
+1.2.0版本 2023年4月7日 更新内容：
+合并代码，优化bug
diff --git a/docker_file/seamom_package/apk/Debug/setup.xml b/docker_file/seamom_package/apk/Debug/setup.xml
index 6239f0a..528bcae 100644
--- a/docker_file/seamom_package/apk/Debug/setup.xml
+++ b/docker_file/seamom_package/apk/Debug/setup.xml
@@ -9,7 +9,7 @@
   <defaultBay>
   </defaultBay>
   <version>
-    1.1.3
+    1.2.0
   </version>
   <file> 
     <fileName>languages\ChineseSimplified.xml</fileName>