diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanDetailServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanDetailServiceImpl.java
index 63088e4..78236ff 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanDetailServiceImpl.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanDetailServiceImpl.java
@@ -551,7 +551,7 @@ public class MesProductPlanDetailServiceImpl implements IMesProductPlanDetailSer
             throw new ServiceException("配对条码有误，未找到原材料条码信息");
         }
 
-        if (StringUtils.isNotEmpty(bindBarcodeInfo.getSafeFlag()) &&
+        if (StringUtils.isNotEmpty(bindBarcodeInfo.getSingleFlag()) &&
                 bindBarcodeInfo.getSingleFlag().equals(MesConstants.MES_BARCODE_SINGLE_FLAG_INTERNAL)) {//对内生产
             if (StringUtils.isEmpty(bindBarcodeInfo.getProductBarcode())) {
                 throw new ServiceException("未按成品条码生成原材料条码");
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductPlanMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductPlanMapper.xml
index 4afd90d..0fd1cb9 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductPlanMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductPlanMapper.xml
@@ -52,6 +52,7 @@
 
         <result property="displayFlag" column="display_flag"/>
         <result property="processProductionTime" column="process_production_time"/>
+        <result property="nickName" column="nick_name"/>
     </resultMap>
 
     <resultMap id="MesProductPlanMesProductPlanDetailResult" type="MesProductPlan" extends="MesProductPlanResult">
@@ -298,7 +299,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="sopId != null and sopId != ''">sop_id = #{sopId},</if>
+            <if test="sopId != null">sop_id = #{sopId},</if>
         </trim>
         where plan_id = #{planId}
     </update>
@@ -507,4 +508,38 @@
 
     </select>
 
+
+
+    <select id="selectOnlyConflictMesProductPlans" parameterType="MesProductPlan" resultMap="MesProductPlanResult">
+        select a.plan_id,
+        a.product_order_id,
+        a.plan_code,
+        a.dispatch_code,
+        a.material_id,
+        a.material_bom_id,
+        a.process_id,
+        a.process_order,
+        a.last_process_id,
+        a.final_process_flag,
+        a.station_id,
+        a.user_id,
+        a.production_time,
+        a.dispatch_amount,
+        a.plan_amount,
+        a.complete_amount,
+        a.plan_begin_time,
+        a.plan_end_time,
+        su.nick_name
+        from mes_product_plan a
+        left join sys_user su on a.user_id=su.user_id
+        <where>
+            AND date_format(a.plan_begin_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{planEndTime},'%Y-%m-%d %H:%i:%s')
+            AND date_format(a.plan_end_time,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{planBeginTime},'%Y-%m-%d %H:%i:%s')
+            AND a.user_id = #{userId}
+            AND a.plan_status in ('1','2')
+        </where>
+
+    </select>
+
+
 </mapper>
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawInstock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawInstock.java
index 1d7033c..6c517ed 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawInstock.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawInstock.java
@@ -69,6 +69,12 @@ public class WmsRawInstock extends BaseEntity
     @Excel(name = "执行状态(0待执行,1执行中,2执行完成)")
     private String executeStatus;
 
+    /**请求返回标识(1是)，wcs在将execute_status改为1时此return_flag改为null*/
+    private String returnFlag;
+
+    private String planDetailCode;
+
+
     /** 同步ERP状态(0:失败,1成功) */
     @Excel(name = "同步ERP状态(0:失败,1成功)")
     private String erpStatus;
@@ -264,6 +270,23 @@ public class WmsRawInstock extends BaseEntity
     {
         return executeStatus;
     }
+
+    public String getReturnFlag() {
+        return returnFlag;
+    }
+
+    public void setReturnFlag(String returnFlag) {
+        this.returnFlag = returnFlag;
+    }
+
+    public String getPlanDetailCode() {
+        return planDetailCode;
+    }
+
+    public void setPlanDetailCode(String planDetailCode) {
+        this.planDetailCode = planDetailCode;
+    }
+
     public void setErpStatus(String erpStatus)
     {
         this.erpStatus = erpStatus;
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsRawBackVo.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsRawBackVo.java
index 149cf48..eb59ab5 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsRawBackVo.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsRawBackVo.java
@@ -20,4 +20,8 @@ public class WmsRawBackVo {
 
     @NotNull(message="返库ID不能为空")
     private Long warehouseId;
+
+    //生产计划编号
+    @NotBlank(message="生产计划明细编号必须输入")
+    private String planDetailCode;
 }
diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawInstockServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawInstockServiceImpl.java
index fa3d96c..ced7b65 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawInstockServiceImpl.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawInstockServiceImpl.java
@@ -17,9 +17,11 @@ import com.hw.mes.api.RemoteMesService;
 import com.hw.mes.api.domain.MesBaseBarcodeInfo;
 import com.hw.wms.config.WmsConfig;
 import com.hw.wms.domain.WmsBaseLocation;
+import com.hw.wms.domain.WmsRawOutstock;
 import com.hw.wms.domain.WmsRawStock;
 import com.hw.wms.domain.vo.*;
 import com.hw.wms.mapper.WmsBaseLocationMapper;
+import com.hw.wms.mapper.WmsRawOutstockMapper;
 import com.hw.wms.mapper.WmsRawStockMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
@@ -53,6 +55,9 @@ public class WmsRawInstockServiceImpl implements IWmsRawInstockService {
     @Autowired
     private WmsRawStockMapper wmsRawStockMapper;
 
+    @Autowired
+    private WmsRawOutstockMapper wmsRawOutstockMapper;
+
     @Autowired
     private WmsConfig wmsConfig;
 
@@ -281,7 +286,7 @@ public class WmsRawInstockServiceImpl implements IWmsRawInstockService {
             throw new ServiceException("物料条码有误");
         }
 
-        //判断此柜体是否已跟拆分门板绑定，如果未绑定不允许返库
+        //判断此柜体是否已跟配对码绑定，如果未绑定不允许返库
         R<MesBaseBarcodeInfo> bindBarcodeInfoR = remoteMesService.getBarcodeByBindBarcode(materialBarcode, SecurityConstants.INNER);
         if (bindBarcodeInfoR == null) {
             throw new ServiceException("没找到绑定信息，不能返库");
@@ -291,17 +296,41 @@ public class WmsRawInstockServiceImpl implements IWmsRawInstockService {
             throw new ServiceException("没找到绑定信息，不能返库");
         }
 
+        WmsRawInstock queryReturnRawInstock = new WmsRawInstock();
+        queryReturnRawInstock.setReturnFlag("1");
+        List<WmsRawInstock> returnRawInstocks = wmsRawInstockMapper.selectWmsRawInstockList(queryReturnRawInstock);
+        if (returnRawInstocks != null && !returnRawInstocks.isEmpty()) {
+            throw new ServiceException("有正在返库的记录，不能再次申请");
+        }
+
+        WmsRawInstock queryPlanRawInstock = new WmsRawInstock();
+        queryPlanRawInstock.setPlanDetailCode(wmsRawBackVo.getPlanDetailCode());
+        List<WmsRawInstock> planRawInstocks = wmsRawInstockMapper.selectWmsRawInstockList(queryPlanRawInstock);
+        if (planRawInstocks != null && !planRawInstocks.isEmpty()) {
+            throw new ServiceException("此生产明细已经申请过返库，无需重复申请");
+        }
+
+        //4楼上5楼的不需要申请领柜体，所以也不需要返库
+        WmsRawOutstock queryRawOutsotck = new WmsRawOutstock();
+        queryRawOutsotck.setPlanDetailCode(wmsRawBackVo.getPlanDetailCode());
+        queryRawOutsotck.setSplitFlag(WmsConstants.WMS_RAW_OUTSTOCK_SPLIT_FLAG_YES);
+        List<WmsRawOutstock> wmsRawOutstocks = wmsRawOutstockMapper.selectWmsRawOutstockList(queryRawOutsotck);
+        if (wmsRawOutstocks == null || wmsRawOutstocks.isEmpty()) {
+            throw new ServiceException("没有领取柜体，无需返库");
+        }
+
+
+        if (!baseBarcodeInfo.getPlanDetailCode().equals(wmsRawBackVo.getPlanDetailCode())) {
+            throw new ServiceException(String.format("此物料条码明细编号为%s:,与此明细编号不符", baseBarcodeInfo.getPlanDetailCode()));
+        }
+
         //判断是否有返库记录，不能重复提交
         WmsRawInstock queryRawInstock = new WmsRawInstock();
-        queryRawInstock.setMaterialBarcode(materialBarcode);//materialBarcode是索引，先不需要加别的条件，获取出来再过滤
+        queryRawInstock.setMaterialBarcode(materialBarcode);
+        queryRawInstock.setInstockType(WmsConstants.RAW_INSTOCK_INSTOCK_TYPE_RETURN);
         List<WmsRawInstock> wmsRawInstocks = wmsRawInstockMapper.selectWmsRawInstockList(queryRawInstock);
         if (wmsRawInstocks != null && !wmsRawInstocks.isEmpty()) {
-            List<WmsRawInstock> returnRawInstocks = wmsRawInstocks.stream().filter
-                            (wmsRawInstock -> wmsRawInstock.getInstockType().equals(WmsConstants.RAW_INSTOCK_INSTOCK_TYPE_RETURN))
-                    .collect(Collectors.toList());
-            if (returnRawInstocks != null && !returnRawInstocks.isEmpty()) {
-                throw new ServiceException("已经有此物料返库记录，无需重复返库");
-            }
+            throw new ServiceException("已经有此物料返库记录，无需重复返库");
         }
 
         WmsRawInstock wmsRawInstock = new WmsRawInstock();
@@ -316,6 +345,8 @@ public class WmsRawInstockServiceImpl implements IWmsRawInstockService {
         wmsRawInstock.setPalletInfoCode(baseBarcodeInfo.getPalletInfoCode());
         wmsRawInstock.setInstockAmount(BigDecimal.ONE);
         wmsRawInstock.setExecuteStatus(WmsConstants.WMS_EXECUTE_STATUS_TOEXECUTE);
+        wmsRawInstock.setReturnFlag("1");//返回标识，只能有一个returnflag为1的。
+        wmsRawInstock.setPlanDetailCode(wmsRawBackVo.getPlanDetailCode());
         wmsRawInstock.setApplyBy(SecurityUtils.getUsername());
         wmsRawInstock.setApplyDate(new Date());
 
diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml
index 5c35a54..c851c25 100644
--- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml
+++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml
@@ -18,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="palletInfoCode"    column="pallet_info_code"    />
         <result property="instockAmount"    column="instock_amount"    />
         <result property="executeStatus"    column="execute_status"    />
+        <result property="returnFlag"    column="return_flag"    />
+        <result property="planDetailCode"    column="plan_detail_code"    />
         <result property="erpStatus"    column="erp_status"    />
         <result property="erpAmount"    column="erp_amount"    />
         <result property="applyBy"    column="apply_by"    />
@@ -52,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operationType != null  and operationType != ''"> and operation_type = #{operationType}</if>
             <if test="instockType != null  and instockType != ''"> and instock_type = #{instockType}</if>
             <if test="executeStatus != null  and executeStatus != ''"> and execute_status = #{executeStatus}</if>
+            <if test="returnFlag != null  and returnFlag != ''"> and return_flag = #{returnFlag}</if>
+            <if test="planDetailCode != null  and planDetailCode != ''"> and plan_detail_code = #{planDetailCode}</if>
             <if test="applyBy != null  and applyBy != ''"> and apply_by = #{applyBy}</if>
             <if test="applyDate != null "> and apply_date = #{applyDate}</if>
             <if test="updateDate != null "> and update_date = #{updateDate}</if>
@@ -80,6 +84,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="palletInfoCode != null">pallet_info_code,</if>
             <if test="instockAmount != null">instock_amount,</if>
             <if test="executeStatus != null and executeStatus != ''">execute_status,</if>
+            <if test="returnFlag != null and returnFlag != ''">return_flag,</if>
+            <if test="planDetailCode != null and planDetailCode != ''">plan_detail_code,</if>
             <if test="erpStatus != null">erp_status,</if>
             <if test="erpAmount != null">erp_amount,</if>
             <if test="applyBy != null">apply_by,</if>
@@ -104,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="palletInfoCode != null">#{palletInfoCode},</if>
             <if test="instockAmount != null">#{instockAmount},</if>
             <if test="executeStatus != null and executeStatus != ''">#{executeStatus},</if>
+            <if test="returnFlag != null and returnFlag != ''">#{returnFlag},</if>
+            <if test="planDetailCode != null and planDetailCode != ''">#{planDetailCode},</if>
             <if test="erpStatus != null">#{erpStatus},</if>
             <if test="erpAmount != null">#{erpAmount},</if>
             <if test="applyBy != null">#{applyBy},</if>
diff --git a/hw-ui/src/utils/ruoyi.js b/hw-ui/src/utils/ruoyi.js
index f1e1418..2e18e8b 100644
--- a/hw-ui/src/utils/ruoyi.js
+++ b/hw-ui/src/utils/ruoyi.js
@@ -266,3 +266,18 @@ export function fileDownload(file) {
     }
   })
 }
+
+
+// 表单重置
+export function getNowDateTime() {
+  let now = new Date();
+  let year = now.getFullYear();
+  let month = ('0' + (now.getMonth() + 1)).slice(-2); // 月份是从0开始的，所以加1
+  let day = ('0' + now.getDate()).slice(-2);
+  let hours = ('0' + now.getHours()).slice(-2);
+  let minutes = ('0' + now.getMinutes()).slice(-2);
+  let seconds = ('0' + now.getSeconds()).slice(-2);
+
+  return year+"-"+month+"-"+day +" "+ hours+":"+minutes+":"+seconds;
+}
+
diff --git a/hw-ui/src/views/board/barcode/workshopBarcode.vue b/hw-ui/src/views/board/barcode/workshopBarcode.vue
index 603048f..a7a2987 100644
--- a/hw-ui/src/views/board/barcode/workshopBarcode.vue
+++ b/hw-ui/src/views/board/barcode/workshopBarcode.vue
@@ -168,7 +168,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" :loading="submitLoading" @click="submitForm">确 定</el-button>
         <el-button @click="cancelProductBarcode">取 消</el-button>
       </div>
     </el-dialog>
@@ -246,6 +246,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      // 保存遮罩层
+      submitLoading:false,
       // 选中数组
       ids: [],
       barcodeInfos: [],
@@ -428,6 +430,7 @@ export default {
           // this.queryParams.barcodeTypeStr = this.BARCODE_TYPE.PRODUCT + "," + this.BARCODE_TYPE.BIND_BARCODE;
         } else if (barcodeType === this.BARCODE_TYPE_PARAM.SPLIT_BIND_BARCODE) {//拆分原材料配对码
           this.queryParams.barcodeType = this.BARCODE_TYPE.RAW ;
+          this.queryParams.bindOrFlag = "1";
           // this.queryParams.barcodeTypeStr = this.BARCODE_TYPE.RAW + "," + this.BARCODE_TYPE.BIND_BARCODE;
           // this.queryParams.bindOrFlag = "1";
         }
@@ -633,10 +636,13 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.submitLoading = true;
           addProductBarcode(this.form).then(response => {
             this.$modal.msgSuccess("新增成功");
             this.addProductBarcodeOpen = false;
             this.getList();
+          }).finally(e =>{
+             this.submitLoading = false;
           });
         }
       });
diff --git a/hw-ui/src/views/board/common/applyRawOutstock.vue b/hw-ui/src/views/board/common/applyRawOutstock.vue
index 1e04944..47fed21 100644
--- a/hw-ui/src/views/board/common/applyRawOutstock.vue
+++ b/hw-ui/src/views/board/common/applyRawOutstock.vue
@@ -1,5 +1,5 @@
 <template>
-  <div >
+  <div>
     <el-form ref="form" :model="form" label-width="100px">
       <el-form-item label="派工单号">
         <el-input v-model="form.planCode" disabled style="width:360px"></el-input>
@@ -19,10 +19,11 @@
     </el-form>
     <el-table
       :cell-style="{textAlign:'center'}"
-      :data="form.wmsRawOutstockDetailList"
+      :data="wmsRawOutstockDetailList"
       :header-cell-style="{textAlign:'center'}"
       max-height="19.13vw"
       style="width: 100%;"
+      v-loading="loading"
     >
       <el-table-column
         label="物料编号"
@@ -101,7 +102,9 @@
     />
 
     <div style="text-align: center;margin-top: 30px">
-      <el-button type="primary" @click="submitForm">申请</el-button>
+      <el-button type="primary" :loading="submitLoading" @click="submitForm">申请</el-button>
+      <el-button type="info" @click="closeParentDialog">关闭</el-button>
+
     </div>
 
   </div>
@@ -119,10 +122,13 @@ export default {
     }
   },
   dicts: ['mes_safe_flag'],
+  inject: ['closeDialog'],
   data() {
     return {
       // 遮罩层
       loading: true,
+      //保存遮罩层
+      submitLoading : false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -140,6 +146,7 @@ export default {
       // 是否显示弹出层
       open: false,
       maxPlanAmount: 1,
+      returnFlag: '',
       taskType: '',
       // 查询参数
       queryParams: {
@@ -170,6 +177,10 @@ export default {
       },
       // 表单参数
       form: {},
+      RETURN_FLAG: {//返库标识
+        YES: '1',//是
+      },
+      wmsRawOutstockDetailList:[],
     };
   },
   created() {
@@ -195,9 +206,14 @@ export default {
           warehouseFloor: this.defineData?.warehouseFloor,
           wmsRawOutstockDetailList: []
         }
+
+        alert(JSON.stringify(this.form))
       }
       if (this.defineData.maxPlanAmount) {
-         this.maxPlanAmount = this.defineData?.maxPlanAmount
+        this.maxPlanAmount = this.defineData.maxPlanAmount
+      }
+      if (this.defineData.returnFlag) {
+        this.returnFlag = this.defineData.returnFlag;
       }
     },
 
@@ -223,6 +239,7 @@ export default {
 
     // 物料搜索
     searchMaterial() {
+      this.loading = true;
       if (this.form.warehouseId === null || this.form.warehouseId === undefined
         || this.form.warehouseId === "") {
         return;
@@ -233,12 +250,13 @@ export default {
       this.queryParams.planDetailCode = this.form.planDetailCode;
       getStockTotal(this.queryParams).then(e => {
         this.total = e.total;
-        this.form.wmsRawOutstockDetailList = e.rows.map(r => {
+        this.wmsRawOutstockDetailList = e.rows.map(r => {
           return {
             stockTotalId: r.stockTotalId,
             materialId: r.materialId,
             materialCode: r.materialCode,
             materialName: r.materialName,
+            materialSpec: r.materialSpec,
             safeFlag: r.safeFlag,
             availableAmount: r.totalAmount - r.occupyAmount - r.frozenAmount,
             unavailableAmount: r.occupyAmount + r.frozenAmount,
@@ -246,20 +264,11 @@ export default {
             planAmount: this.planAmount
           }
         })
+        this.loading = false;
       })
     },
 
 
-    /** 查询物料信息列表 */
-    getList() {
-      this.loading = true;
-      this.queryParams.selectType = this.selectType;
-      listMaterialinfo(this.queryParams).then(response => {
-        this.materialinfoList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -302,12 +311,29 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
+      let realOutstockDetailList = this.wmsRawOutstockDetailList.filter(detail => detail.planAmount > 0);
+      if (realOutstockDetailList.length <= 0) {
+        this.$modal.msgWarning("请输入领取数量");
+        return;
+      }
+      this.submitloading = true;
+      this.form.wmsRawOutstockDetailList = realOutstockDetailList;
       applyRawOutstock(this.form).then(e => {
-        this.dialogVisible = false
+        if (this.returnFlag === this.RETURN_FLAG.YES) {
+          this.closeParentDialog()
+        } else {
+          this.searchMaterial();
+        }
         this.$modal.msgSuccess("申请成功");
+      }).finally(e => {
+        this.submitloading = false;
       })
     },
 
+    closeParentDialog() {
+      this.closeDialog()
+    }
+
   }
 };
 </script>
diff --git a/hw-ui/src/views/board/fifthFloor/index.vue b/hw-ui/src/views/board/fifthFloor/index.vue
index 6305b92..87397c2 100644
--- a/hw-ui/src/views/board/fifthFloor/index.vue
+++ b/hw-ui/src/views/board/fifthFloor/index.vue
@@ -563,6 +563,11 @@ export default {
     PrintPage
   },
   dicts: ['wms_raw_return_task_type', 'mes_safe_flag'],
+  provide(){
+    return{
+      closeDialog : this.closeDialog
+    }
+  },
   data() {
     return {
       fileList: [],
@@ -722,10 +727,10 @@ export default {
       //   this.$modal.msgError("登录工位有误");
       //   return;
       // }
-      this.loginStationInfo = e.data;
+      // this.loginStationInfo = e.data;
 
       //TODO
-      this.loginStationInfo = {stationId:"1",endStationCode:"ss"}
+      this.loginStationInfo = {stationId:"1",stationCode:"ZP_02"}
       this.getProductPlans();
       this.getChartData();
     });
@@ -1407,15 +1412,16 @@ export default {
         applyReason: '',
         taskType: this.taskType,
         stationId: this.loginStationInfo.stationId,
-        endStationCode: this.loginStationInfo.stationCode,
+        stationCode: this.loginStationInfo.stationCode,
         warehouseFloor: 5,
         wmsRawOutstockDetailList: []
       }
-
     },
 
 
-
+    closeDialog(){
+      this.dialogVisible = false;
+    },
 
 
     print() {
@@ -1489,11 +1495,11 @@ export default {
     },
 
     /** 柜体返库按钮操作 */
-    handleRawBack(scope) {
+    handleRawBack() {
       this.resetRawBack();
       // 获取仓库信息
-      if (this.warehouseList == null || this.warehouseList.length == 0) {
-        getWarehouses({"warehouseFloor": 5, "returnFlag": 1}).then(e => {
+      if (this.warehouseList == null || this.warehouseList.length === 0) {
+        getWarehouses({warehouseFloor: 5, returnFlag: 1}).then(e => {
           this.warehouseList = e.data
           this.rawBackForm.warehouseId = this.warehouseList[0]?.warehouseId
         })
@@ -1508,6 +1514,7 @@ export default {
     submitRawBack() {
       this.$refs["rawBackForm"].validate(valid => {
         if (valid) {
+          this.rawBackForm.planDetailCode = this.form.planDetailCode;
           applyRawBack(this.rawBackForm).then(response => {
             this.$modal.msgSuccess("申请成功");
             this.cancelRawBack();
diff --git a/hw-ui/src/views/mes/barcode/index.vue b/hw-ui/src/views/mes/barcode/index.vue
index f38a2e9..c607d8d 100644
--- a/hw-ui/src/views/mes/barcode/index.vue
+++ b/hw-ui/src/views/mes/barcode/index.vue
@@ -45,6 +45,17 @@
         />
       </el-form-item>
 
+      <el-form-item label="打印标识" prop="printFlag">
+        <el-select v-model="queryParams.printFlag" placeholder="请选择打印标识" clearable>
+          <el-option
+            v-for="dict in dict.type.mes_print_flag"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -621,6 +632,7 @@ export default {
         pageSize: 10,
         printTime: null,
         printPerson: null,
+        printFlag: null,
         batchFlag: null,
         barcodeType: "1",
         barcodeInfo: null,
diff --git a/hw-ui/src/views/mes/productplan/editProductPlan.vue b/hw-ui/src/views/mes/productplan/editProductPlan.vue
index 8735967..f44fad9 100644
--- a/hw-ui/src/views/mes/productplan/editProductPlan.vue
+++ b/hw-ui/src/views/mes/productplan/editProductPlan.vue
@@ -61,7 +61,8 @@
           >
             <template slot-scope="scope">
               <el-button type="danger" icon="el-icon-delete" @click="handleDeleteMesProductPlan(scope)"
-                         v-if="scope.row.firstFlag != null && scope.row.firstFlag === '1'"></el-button>
+                         v-if="scope.row.firstFlag != null && scope.row.firstFlag === '1'
+                         && form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!==ORDER_STATUS.RECALLED && form.orderStatus!==ORDER_STATUS.DELETED"></el-button>
             </template>
           </el-table-column>
 
@@ -138,14 +139,14 @@
             <template slot-scope="scope">
               <el-input-number style="width:150px;" :min="0" v-model="scope.row.productionTime"
                                :disabled="(scope.row.processType === PROCESS_TYPE.MANUAL && scope.row.children != null && scope.row.children !== undefined)
-                                || scope.row.planStatus=== PLAN_STATUS.FINISHED"/>
+                                || scope.row.planStatus=== PLAN_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"/>
             </template>
           </el-table-column>
           <el-table-column align="center" label="计划开始时间" prop="planBeginTime" width="230">
             <template slot-scope="scope">
               <el-date-picker v-model="scope.row.planBeginTime" style="width:200px;"
                               :disabled="(scope.row.processType === PROCESS_TYPE.MANUAL && scope.row.children != null && scope.row.children !== undefined)
-                              || scope.row.planStatus=== PLAN_STATUS.FINISHED"
+                              || scope.row.planStatus=== PLAN_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"
                               clearable
                               placeholder="请选择计划开始时间"
                               type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
@@ -156,7 +157,7 @@
             <template slot-scope="scope">
               <el-date-picker v-model="scope.row.planEndTime" style="width:200px;"
                               :disabled="(scope.row.processType === PROCESS_TYPE.MANUAL && scope.row.children != null && scope.row.children !== undefined)
-                              || scope.row.planStatus=== PLAN_STATUS.FINISHED"
+                              || scope.row.planStatus=== PLAN_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"
                               clearable
                               placeholder="请选择计划完成时间"
                               type="datetime" value-format="yyyy-MM-dd HH:mm:ss"/>
@@ -166,7 +167,7 @@
           <el-table-column align="center" label="状态" prop="planStatus" width="150">
             <template slot-scope="scope">
               <el-select v-model="scope.row.planStatus" :disabled="true" placeholder="请选择状态"
-                         v-if="scope.row.children == null || scope.row.children === undefined">
+                         v-if="scope.row.children == null || scope.row.children === undefined || scope.row.processType === PROCESS_TYPE.AUTO">
                 <el-option
                   v-for="dict in dict.type.product_status"
                   :key="dict.value"
@@ -202,7 +203,9 @@
                 size="mini"
                 type="primary"
                 @click="handleApplyRawOutstock(scope.row)"
-                v-if="scope.row.processType === PROCESS_TYPE.AUTO && scope.row.planId!=null && scope.row.planId!==''"
+                v-if="scope.row.processType === PROCESS_TYPE.AUTO && scope.row.planId!=null && scope.row.planId!==''
+                      && scope.row.planStatus !== PLAN_STATUS.FINISHED
+                      && form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!==ORDER_STATUS.RECALLED && form.orderStatus!==ORDER_STATUS.DELETED"
               >投料
               </el-button>
 
@@ -438,7 +441,7 @@ export default {
     // 文件大小限制(K)
     fileSize: {
       type: Number,
-      default: 500000,
+      default: 500,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
diff --git a/hw-ui/src/views/wms/common/applyRawOutstock.vue b/hw-ui/src/views/wms/common/applyRawOutstock.vue
index a12f323..b76edd9 100644
--- a/hw-ui/src/views/wms/common/applyRawOutstock.vue
+++ b/hw-ui/src/views/wms/common/applyRawOutstock.vue
@@ -281,6 +281,10 @@ export default {
       })
     },
 
+    closeDialog(){
+
+    }
+
   }
 };
 </script>