change - 新增原材料条码：取消采购订单和销售订单绑定

hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesPurchaseOrder.java

@@ -305,6 +305,19 @@ public class MesPurchaseOrder extends BaseEntity {
 
     private String projectName;//项目名称
 
+    /**
+     * 收料数量
+     */
+    private BigDecimal actLandAmount;
+
+    public BigDecimal getActLandAmount() {
+        return actLandAmount;
+    }
+
+    public void setActLandAmount(BigDecimal actLandAmount) {
+        this.actLandAmount = actLandAmount;
+    }
+
     public Long getSerialNumber() {
         return serialNumber;
     }

hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java

@@ -473,6 +473,7 @@ public class KingdeeErpService {
         String FTONDCombo = (String) objectParams.get("FTONDCombo");//领料类型(必填项)
         String F_JSJY_SCDX = objectParams.containsKey("F_JSJY_SCDX") ? (String) objectParams.get("F_JSJY_SCDX") : null; //来源于该物料bom成品（如果是半成品，那还需要找到该半成品的成品）
         String F_TOND_Base1 = objectParams.containsKey("F_TOND_Base1") ? (String) objectParams.get("F_TOND_Base1") : null; //来源于成品bom所在销售订单的项目号
+        String tips = objectParams.containsKey("tips") ? (String) objectParams.get("tips") : null; //明细备注
         try {
             //业务对象标识
             String formId = KingdeeConfig.STK_MisDelivery;
@@ -510,6 +511,11 @@ public class KingdeeErpService {
             JSONObject Base1Object = new JSONObject();
             Base1Object.put("FNumber", F_TOND_Base1);
             FEntity.put("F_TOND_Base1", Base1Object);
+            if (StringUtils.isNotNull(tips)) {
+                JSONObject tipsObject = new JSONObject();
+                tipsObject.put("FNumber", tips);
+                FEntity.put("FEntryNote", tipsObject);
+            }
 
             ArrayList<JSONObject> entityList = new ArrayList<>();
             entityList.add(FEntity);

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesPurchaseOrderController.java

@@ -229,14 +229,15 @@ public class MesPurchaseOrderController extends BaseController
 
 
     /**
-     * 查询采购订单信息,Join order_bind
+     * 查询采购订单信息,Join order_bind 新增原材料条码
      */
 //    @RequiresPermissions("mes:purchaseOrder:list")
     @GetMapping("/getPurchaseOrdersWithBind")
     public TableDataInfo getPurchaseOrdersWithBind(MesPurchaseOrder mesPurchaseOrder)
     {
         startPage();
-        List<MesPurchaseOrder> list = mesPurchaseOrderService.selectPurchaseOrderJoinList(mesPurchaseOrder);
+//        List<MesPurchaseOrder> list = mesPurchaseOrderService.selectPurchaseOrderJoinList(mesPurchaseOrder);
+        List<MesPurchaseOrder> list = mesPurchaseOrderService.selectPurchaseOrdersWithBindJoinList(mesPurchaseOrder);
         return getDataTable(list);
     }
 

hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesPurchaseOrderMapper.java

@@ -159,6 +159,10 @@ public interface MesPurchaseOrderMapper
      */
     public MesPurchaseOrder selectMesPurchaseOrderJoinMaterialByPurchaseOrderId(Long purchaseOrderId);
 
-
-
+    /**
+     * 查询采购订单信息,Join order_bind 新增原材料条码
+     * @param mesPurchaseOrder
+     * @return
+     */
+    List<MesPurchaseOrder> selectPurchaseOrdersWithBindJoinList(MesPurchaseOrder mesPurchaseOrder);
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesPurchaseOrderService.java

@@ -179,4 +179,11 @@ public interface IMesPurchaseOrderService
      *采购订单超时统计
      */
     public void purchaseOrderOverTimeAlarm();
+
+    /**
+     * 查询采购订单信息,Join order_bind 新增原材料条码
+     * @param mesPurchaseOrder
+     * @return
+     */
+    List<MesPurchaseOrder> selectPurchaseOrdersWithBindJoinList(MesPurchaseOrder mesPurchaseOrder);
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java

@@ -203,37 +203,37 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
         BigDecimal barcodeAmount = mesBaseBarcodeInfo.getBarcodeAmount();//要生成的条码数量
         String poNo = StringUtils.isEmpty(mesBaseBarcodeInfo.getPoNo()) ? "0" : mesBaseBarcodeInfo.getPoNo();
         String batchCode = this.getRawBatchCode(poNo);
-//        if (!mesBaseMaterialInfo.getAlwaysFlag().equals(MesConstants.MES_MATERIAL_ALWAYS_FLAG_YES)) {
-        Long orderBindId = mesBaseBarcodeInfo.getOrderBindId();
-        if (orderBindId == null) {
-            throw new ServiceException("请选择绑定销售订单信息的采购订单");
-        }
-
-        MesOrderBind mesOrderBind = mesOrderBindMapper.selectMesOrderBindByOrderBindId(orderBindId);
-        BigDecimal bindAmount = mesOrderBind.getBindAmount();
-        BigDecimal bindBarcodeAmount = mesOrderBind.getBarcodeAmount();//已经生成的条码数量
-        BigDecimal availableAmount = bindAmount.subtract(bindBarcodeAmount).setScale(0, RoundingMode.CEILING);;//可用数量向上取整
-        if (barcodeAmount.compareTo(availableAmount) > 0) {
-            throw new ServiceException("条码数量不能大于可用数量");
-        }
+////        if (!mesBaseMaterialInfo.getAlwaysFlag().equals(MesConstants.MES_MATERIAL_ALWAYS_FLAG_YES)) {
+//        Long orderBindId = mesBaseBarcodeInfo.getOrderBindId();
+//        if (orderBindId == null) {
+//            throw new ServiceException("请选择绑定销售订单信息的采购订单");
+//        }
+//
+//        MesOrderBind mesOrderBind = mesOrderBindMapper.selectMesOrderBindByOrderBindId(orderBindId);
+//        BigDecimal bindAmount = mesOrderBind.getBindAmount();
+//        BigDecimal bindBarcodeAmount = mesOrderBind.getBarcodeAmount();//已经生成的条码数量
+//        BigDecimal availableAmount = bindAmount.subtract(bindBarcodeAmount).setScale(0, RoundingMode.CEILING);;//可用数量向上取整
+//        if (barcodeAmount.compareTo(availableAmount) > 0) {
+//            throw new ServiceException("条码数量不能大于可用数量");
+//        }
 
 
         MesBaseBarcodeInfo toInsertedBarcodeInfo;
         for (long i = 0; i < barcodeAmount.intValue(); i++) {
             // 生成条码数量的不同条码内容
             toInsertedBarcodeInfo = getInsertedBarcodeInfo(mesBaseBarcodeInfo, Seq.getId(Seq.mesBarcodeSeqType, Seq.mesBarcodeCode), batchCode, userName, currentDate);
-            toInsertedBarcodeInfo.setSaleOrderId(mesOrderBind.getSaleOrderId());
-            toInsertedBarcodeInfo.setSaleorderCode(mesOrderBind.getSaleOrderCode());
-            toInsertedBarcodeInfo.setSafeFlag(MesConstants.MES_ORDER_BIND_SAFE_FLAG_NO);
+            toInsertedBarcodeInfo.setSaleOrderId(0L);
+//            toInsertedBarcodeInfo.setSaleorderCode(mesOrderBind.getSaleOrderCode());
+            toInsertedBarcodeInfo.setSafeFlag(MesConstants.MES_ORDER_BIND_SAFE_FLAG_YES);
             mesBaseBarcodeInfoMapper.insertMesBaseBarcodeInfo(toInsertedBarcodeInfo);
         }
 
 
         //更新订单绑定的条码已绑定数量
-        mesOrderBind.setBarcodeAmount(bindBarcodeAmount.add(barcodeAmount));
-        mesOrderBind.setUpdateBy(userName);
-        mesOrderBind.setUpdateTime(currentDate);
-        mesOrderBindMapper.updateMesOrderBind(mesOrderBind);
+//        mesOrderBind.setBarcodeAmount(bindBarcodeAmount.add(barcodeAmount));
+//        mesOrderBind.setUpdateBy(userName);
+//        mesOrderBind.setUpdateTime(currentDate);
+//        mesOrderBindMapper.updateMesOrderBind(mesOrderBind);
 
 
 //        } else {

hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java

@@ -653,6 +653,16 @@ public class MesPurchaseOrderServiceImpl implements IMesPurchaseOrderService {
 
     }
 
+    /**
+     * 查询采购订单信息,Join order_bind 新增原材料条码
+     * @param mesPurchaseOrder
+     * @return
+     */
+    @Override
+    public List<MesPurchaseOrder> selectPurchaseOrdersWithBindJoinList(MesPurchaseOrder mesPurchaseOrder) {
+        return mesPurchaseOrderMapper.selectPurchaseOrdersWithBindJoinList(mesPurchaseOrder);
+    }
+
 
     private static SysPointRouter getSysPointRouter(Long purchaseOrderId, Date currentDate) {
         SysPointRouter sysPointRouter = new SysPointRouter();

hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="supplierCode"    column="supplier_code"    />
         <result property="projectNo"    column="project_no"    />
         <result property="projectName" column="project_name"/>
+        <result property="actLandAmount" column="act_land_amount"/>
 
     </resultMap>
 
@@ -527,4 +528,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.purchase_order_id = #{purchaseOrderId}
     </select>
 
+    <select id="selectPurchaseOrdersWithBindJoinList" parameterType="MesPurchaseOrder" resultMap="MesPurchaseOrderResult">
+        select mpo.purchase_order_id,
+        mpo.po_no,
+        mpo.order_amount,
+        mpo.specification_parameter,
+        mbmi.always_flag,
+        mbmi.material_id,
+        mbmi.material_code,
+        mbmi.material_name,
+        mbmi.material_spec,
+        mbmi.batch_flag,
+        mbmi.batch_amount,
+        mprb.act_land_amount
+        from mes_purchase_receive_bill mprb
+        join mes_purchase_order mpo on mprb.po_no = mpo.po_no and mprb.material_id = mpo.material_id
+        join mes_base_material_info mbmi on mprb.material_id = mbmi.erp_id
+        <where>
+            <if test="poNo != null  and poNo != ''"> and mpo.po_no like concat('%', #{poNo}, '%')</if>
+            <if test="materialId != null "> and mpo.material_id = #{materialId}</if>
+        </where>
+        order by mpo.create_time desc
+    </select>
+
 </mapper>

hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsRawOutstockController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.hw.common.core.constant.WmsConstants;
 import com.hw.wms.domain.WmsBaseWarehouse;
 import com.hw.wms.domain.WmsStockTotal;
+import com.hw.wms.domain.dto.OutstockRequestDTO;
 import com.hw.wms.domain.vo.WmsRawOutstockAuditVo;
 import com.hw.wms.service.IWmsBaseWarehouseService;
 import com.hw.wms.service.IWmsStockTotalService;
@@ -190,4 +191,16 @@ public class WmsRawOutstockController extends BaseController
     public AjaxResult applyRawOutstock(@Validated @RequestBody WmsRawOutstock wmsRawOutstock) {
         return toAjax(wmsRawOutstockService.applyRawOutstock(wmsRawOutstock));
     }
+
+    /**
+     * 关联销售订单
+     * @param outstockRequestDTO
+     * @return
+     */
+    @RequiresPermissions("wms:rawOutstockDetail:relation")
+    @Log(title = "原材料出库记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/relateSaleOrder")
+    public AjaxResult associatedSalesOrders(@RequestBody OutstockRequestDTO outstockRequestDTO) {
+        return toAjax(wmsRawOutstockService.associatedSalesOrders(outstockRequestDTO));
+    }
 }

hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsRawOutstockDetailController.java

@@ -0,0 +1,99 @@
+package com.hw.wms.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.hw.common.log.annotation.Log;
+import com.hw.common.log.enums.BusinessType;
+import com.hw.common.security.annotation.RequiresPermissions;
+import com.hw.wms.domain.WmsRawOutstockDetail;
+import com.hw.wms.service.IWmsRawOutstockDetailService;
+import com.hw.common.core.web.controller.BaseController;
+import com.hw.common.core.web.domain.AjaxResult;
+import com.hw.common.core.utils.poi.ExcelUtil;
+import com.hw.common.core.web.page.TableDataInfo;
+
+/**
+ * 原材料出库记录明细Controller
+ *
+ * @author Yinq
+ * @date 2025-06-19
+ */
+@RestController
+@RequestMapping("/rawOutstockDetail")
+public class WmsRawOutstockDetailController extends BaseController {
+    @Autowired
+    private IWmsRawOutstockDetailService wmsRawOutstockDetailService;
+
+    /**
+     * 查询原材料出库记录明细列表
+     */
+    @RequiresPermissions("wms:rawOutstockDetail:list")
+    @GetMapping("/list")
+    public TableDataInfo list(WmsRawOutstockDetail wmsRawOutstockDetail) {
+        startPage();
+        List<WmsRawOutstockDetail> list = wmsRawOutstockDetailService.selectWmsRawOutstockDetailList(wmsRawOutstockDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出原材料出库记录明细列表
+     */
+    @RequiresPermissions("wms:rawOutstockDetail:export")
+    @Log(title = "原材料出库记录明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, WmsRawOutstockDetail wmsRawOutstockDetail) {
+        List<WmsRawOutstockDetail> list = wmsRawOutstockDetailService.selectWmsRawOutstockDetailList(wmsRawOutstockDetail);
+        ExcelUtil<WmsRawOutstockDetail> util = new ExcelUtil<WmsRawOutstockDetail>(WmsRawOutstockDetail.class);
+        util.exportExcel(response, list, "原材料出库记录明细数据");
+    }
+
+    /**
+     * 获取原材料出库记录明细详细信息
+     */
+    @RequiresPermissions("wms:rawOutstockDetail:query")
+    @GetMapping(value = "/{rawOutstockDetailId}")
+    public AjaxResult getInfo(@PathVariable("rawOutstockDetailId") Long rawOutstockDetailId) {
+        return success(wmsRawOutstockDetailService.selectWmsRawOutstockDetailByRawOutstockDetailId(rawOutstockDetailId));
+    }
+
+    /**
+     * 新增原材料出库记录明细
+     */
+    @RequiresPermissions("wms:rawOutstockDetail:add")
+    @Log(title = "原材料出库记录明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody WmsRawOutstockDetail wmsRawOutstockDetail) {
+        return toAjax(wmsRawOutstockDetailService.insertWmsRawOutstockDetail(wmsRawOutstockDetail));
+    }
+
+    /**
+     * 修改原材料出库记录明细
+     */
+    @RequiresPermissions("wms:rawOutstockDetail:edit")
+    @Log(title = "原材料出库记录明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody WmsRawOutstockDetail wmsRawOutstockDetail) {
+        return toAjax(wmsRawOutstockDetailService.updateWmsRawOutstockDetail(wmsRawOutstockDetail));
+    }
+
+    /**
+     * 删除原材料出库记录明细
+     */
+    @RequiresPermissions("wms:rawOutstockDetail:remove")
+    @Log(title = "原材料出库记录明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{rawOutstockDetailIds}")
+    public AjaxResult remove(@PathVariable Long[] rawOutstockDetailIds) {
+        return toAjax(wmsRawOutstockDetailService.deleteWmsRawOutstockDetailByRawOutstockDetailIds(rawOutstockDetailIds));
+    }
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java

@@ -192,6 +192,50 @@ public class WmsRawOutstockDetail extends BaseEntity {
     /** 成品bom所在销售订单的项目号 */
     private String tondBaseId;
 
+    /** 计划编号 */
+    private String planCode;
+
+    /** 计划明细编号 */
+    private String planDetailCode;
+
+    /** 销售订单Id */
+    private Long saleOrderId;
+
+    /** 销售订单编号 */
+    private String saleorderCode;
+
+    public String getPlanCode() {
+        return planCode;
+    }
+
+    public void setPlanCode(String planCode) {
+        this.planCode = planCode;
+    }
+
+    public String getPlanDetailCode() {
+        return planDetailCode;
+    }
+
+    public void setPlanDetailCode(String planDetailCode) {
+        this.planDetailCode = planDetailCode;
+    }
+
+    public Long getSaleOrderId() {
+        return saleOrderId;
+    }
+
+    public void setSaleOrderId(Long saleOrderId) {
+        this.saleOrderId = saleOrderId;
+    }
+
+    public String getSaleorderCode() {
+        return saleorderCode;
+    }
+
+    public void setSaleorderCode(String saleorderCode) {
+        this.saleorderCode = saleorderCode;
+    }
+
     public String getProductId() {
         return productId;
     }

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/dto/OutstockRequestDTO.java

@@ -0,0 +1,50 @@
+package com.hw.wms.domain.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 关联销售订单DTO
+ *
+ * @author Yinq
+ * @date 2025-06-19
+ */
+public class OutstockRequestDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Long rawOutstockDetailId;
+    private BigDecimal outstockAmount;
+    private List<SaleOrderDTO> saleOrders;
+
+    public BigDecimal getOutstockAmount() {
+        return outstockAmount;
+    }
+
+    public void setOutstockAmount(BigDecimal outstockAmount) {
+        this.outstockAmount = outstockAmount;
+    }
+
+    public Long getRawOutstockDetailId() {
+        return rawOutstockDetailId;
+    }
+
+    public void setRawOutstockDetailId(Long rawOutstockDetailId) {
+        this.rawOutstockDetailId = rawOutstockDetailId;
+    }
+
+    public List<SaleOrderDTO> getSaleOrders() {
+        return saleOrders;
+    }
+
+    public void setSaleOrders(List<SaleOrderDTO> saleOrders) {
+        this.saleOrders = saleOrders;
+    }
+
+    @Override
+    public String toString() {
+        return "OutstockRequestDTO{" +
+                "rawOutstockDetailId=" + rawOutstockDetailId +
+                ", saleOrders=" + saleOrders +
+                '}';
+    }
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/dto/SaleOrderDTO.java

@@ -0,0 +1,72 @@
+package com.hw.wms.domain.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 关联销售订单对象
+ *
+ * @author Yinq
+ * @date 2025-06-19
+ */
+public class SaleOrderDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String saleorderCode;
+    private BigDecimal outstockAmount;
+    private Long saleOrderId;
+    private String materialCode;
+    private String materialName;
+
+    public String getSaleorderCode() {
+        return saleorderCode;
+    }
+
+    public void setSaleorderCode(String saleorderCode) {
+        this.saleorderCode = saleorderCode;
+    }
+
+    public BigDecimal getOutstockAmount() {
+        return outstockAmount;
+    }
+
+    public void setOutstockAmount(BigDecimal outstockAmount) {
+        this.outstockAmount = outstockAmount;
+    }
+
+    public Long getSaleOrderId() {
+        return saleOrderId;
+    }
+
+    public void setSaleOrderId(Long saleOrderId) {
+        this.saleOrderId = saleOrderId;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+
+    @Override
+    public String toString() {
+        return "SaleOrderDTO{" +
+                "saleorderCode='" + saleorderCode + '\'' +
+                ", outstockAmount=" + outstockAmount +
+                ", saleOrderId=" + saleOrderId +
+                ", materialCode='" + materialCode + '\'' +
+                ", materialName='" + materialName + '\'' +
+                '}';
+    }
+}

hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsRawOutstockService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import com.alibaba.fastjson2.JSONObject;
 import com.hw.wms.domain.WmsRawOutstock;
 import com.hw.wms.domain.WmsRawOutstockDetail;
+import com.hw.wms.domain.dto.OutstockRequestDTO;
 import com.hw.wms.domain.vo.*;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -169,5 +170,13 @@ public interface IWmsRawOutstockService
      * @return
      */
     public List<WmsRawOutstock> selectWmsRawOutstockJoinMaterialList(WmsRawOutstock wmsRawOutstock);
+
+    /**
+     * 关联销售订单
+     * @param outstockRequestDTO
+     * @return
+     */
+    public int associatedSalesOrders(OutstockRequestDTO outstockRequestDTO);
+
 }
 

hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsErpScheduledTaskServiceImpl.java

@@ -254,6 +254,7 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi
         data.put("FQty", FRealQty);
         data.put("FPrice", outstockDetail.getPrice());
         data.put("FStockId", wmsConfig.getfStockId());
+        data.put("tips", outstockDetail.getTips());
         if (StringUtils.isNotNull(outstockDetail.getProductId())) {
             data.put("F_JSJY_SCDX", outstockDetail.getProductId());
         }

hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java

@@ -18,6 +18,8 @@ import com.hw.mes.api.domain.vo.MesBaseMaterialInfoVo;
 import com.hw.mes.api.domain.vo.MesPdaProductPlanVo;
 import com.hw.wms.config.WmsConfig;
 import com.hw.wms.domain.*;
+import com.hw.wms.domain.dto.OutstockRequestDTO;
+import com.hw.wms.domain.dto.SaleOrderDTO;
 import com.hw.wms.domain.vo.*;
 import com.hw.wms.mapper.*;
 import com.hw.wms.service.IWmsRawOutstockService;
@@ -1446,4 +1448,68 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService {
     public List<WmsRawOutstock> selectWmsRawOutstockJoinMaterialList(WmsRawOutstock wmsRawOutstock){
         return wmsRawOutstockMapper.selectWmsRawOutstockJoinMaterialList(wmsRawOutstock);
     }
+
+    /**
+     * 关联销售订单
+     * @param outstockRequestDTO
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int associatedSalesOrders(OutstockRequestDTO outstockRequestDTO) {
+        Long rawOutstockDetailId = outstockRequestDTO.getRawOutstockDetailId();
+        List<SaleOrderDTO> saleOrders = outstockRequestDTO.getSaleOrders();
+        Date currentDate = new Date();
+        String userName = SecurityUtils.getLoginUser() == null ? SecurityUtils.getUsername() : SecurityUtils.getLoginUser().getNickname();
+        if (saleOrders.isEmpty()) {
+            throw new ServiceException("请关联销售订单！");
+        }
+
+        WmsRawOutstockDetail wmsRawOutstockDetail = wmsRawOutstockDetailMapper.selectWmsRawOutstockDetailByRawOutstockDetailId(rawOutstockDetailId);
+        WmsRawOutstock wmsRawOutstock = wmsRawOutstockMapper.selectWmsRawOutstockByRawOutstockId(wmsRawOutstockDetail.getRawOutstockId());
+        String taskCode = wmsRawOutstock.getTaskCode();
+
+        BigDecimal sumAmount = saleOrders.stream().map(SaleOrderDTO::getOutstockAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        if (outstockRequestDTO.getOutstockAmount().compareTo(sumAmount) > 0) {
+            BigDecimal amount = outstockRequestDTO.getOutstockAmount().subtract(sumAmount);
+            SaleOrderDTO orderDTO = new SaleOrderDTO();
+            orderDTO.setSaleOrderId(wmsRawOutstock.getSaleOrderId());
+            orderDTO.setOutstockAmount(amount);
+            saleOrders.add(0, orderDTO);
+        }
+
+        for (int i = 0; i < saleOrders.size(); i++) {
+            SaleOrderDTO saleOrderDTO = saleOrders.get(i);
+            Long saleOrderId = saleOrderDTO.getSaleOrderId();
+            BigDecimal outstockAmount = saleOrderDTO.getOutstockAmount();
+
+            wmsRawOutstock.setSaleOrderId(saleOrderId);
+            wmsRawOutstock.setOutstockAmount(outstockAmount);
+            wmsRawOutstock.setRealOutstockAmount(outstockAmount);
+            wmsRawOutstock.setUpdateBy(userName);
+            wmsRawOutstock.setUpdateDate(currentDate);
+            Long rawOutstockId = wmsRawOutstockDetail.getRawOutstockId();
+            if (i == 0){
+                wmsRawOutstockMapper.updateWmsRawOutstock(wmsRawOutstock);
+            } else {
+                wmsRawOutstock.setTaskCode(taskCode + "-" + i);
+                wmsRawOutstockMapper.insertWmsRawOutstock(wmsRawOutstock);
+                rawOutstockId = wmsRawOutstock.getRawOutstockId();
+            }
+
+            wmsRawOutstockDetail.setRawOutstockId(rawOutstockId);
+            wmsRawOutstockDetail.setPlanAmount(outstockAmount);
+            wmsRawOutstockDetail.setOutstockAmount(outstockAmount);
+            wmsRawOutstockDetail.setUpdateBy(userName);
+            wmsRawOutstockDetail.setUpdateDate(currentDate);
+            if (i == 0){
+                wmsRawOutstockDetailMapper.updateWmsRawOutstockDetail(wmsRawOutstockDetail);
+            } else {
+                wmsRawOutstockDetailMapper.insertWmsRawOutstockDetail(wmsRawOutstockDetail);
+            }
+
+        }
+
+        return 1;
+    }
 }

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml

@@ -39,40 +39,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tips"    column="tips"    />
         <result property="productId"    column="product_id"    />
         <result property="tondBaseId"    column="tond_base_id"    />
+        <result property="planCode"    column="plan_code"    />
+        <result property="planDetailCode"    column="plan_detail_code"    />
+        <result property="saleOrderId"    column="sale_order_id"    />
+        <result property="saleorderCode"    column="saleorder_code"    />
     </resultMap>
 
     <sql id="selectWmsRawOutstockDetailVo">
-        select raw_outstock_detail_id, raw_outstock_id, location_code, material_barcode, material_id, instock_batch, material_production_Date, plan_amount, outstock_amount, execute_status, erp_status,erp_amount, outstock_person, outstock_time, outstock_way, machine_name, quality_status, create_by, create_date, update_by, update_date, stack_amount, tips from wms_raw_outstock_detail wrod
+        select wrod.raw_outstock_detail_id,
+               wrod.raw_outstock_id,
+               wrod.location_code,
+               wrod.material_barcode,
+               wrod.material_id,
+               wrod.instock_batch,
+               wrod.material_production_Date,
+               wrod.plan_amount,
+               wrod.outstock_amount,
+               wrod.execute_status,
+               wrod.erp_status,
+               wrod.erp_amount,
+               wrod.outstock_person,
+               wrod.outstock_time,
+               wrod.outstock_way,
+               wrod.machine_name,
+               wrod.quality_status,
+               wrod.create_by,
+               wrod.create_date,
+               wrod.update_by,
+               wrod.update_date,
+               wrod.stack_amount,
+               wrod.tips,
+               wro.task_code,
+               wro.plan_code,
+               wro.plan_detail_code,
+               mso.sale_order_id,
+               mso.saleorder_code,
+               mbmi.material_code,
+               mbmi.material_name
+        from wms_raw_outstock_detail wrod
+                 left join wms_raw_outstock wro on wrod.raw_outstock_id = wro.raw_outstock_id
+                 left join mes_sale_order mso on mso.sale_order_id = wro.sale_order_id
+                 left join mes_base_material_info mbmi on mbmi.material_id = wrod.material_id
     </sql>
 
     <select id="selectWmsRawOutstockDetailList" parameterType="WmsRawOutstockDetail" resultMap="WmsRawOutstockDetailResult">
         <include refid="selectWmsRawOutstockDetailVo"/>
         <where>
-            <if test="rawOutstockId != null "> and raw_outstock_id = #{rawOutstockId}</if>
-            <if test="locationCode != null  and locationCode != ''"> and location_code = #{locationCode}</if>
-            <if test="executeStatus != null  and executeStatus != ''"> and execute_status = #{executeStatus}</if>
+            <if test="rawOutstockId != null "> and wrod.raw_outstock_id = #{rawOutstockId}</if>
+            <if test="locationCode != null  and locationCode != ''"> and wrod.location_code = #{locationCode}</if>
+            <if test="executeStatus != null  and executeStatus != ''"> and wrod.execute_status = #{executeStatus}</if>
             <if test="auditStatus != null  and auditStatus != ''"> and exists (select 1 from wms_raw_outstock wro where wro.raw_outstock_id=wrod.raw_outstock_id and wro.audit_status=#{auditStatus})</if>
-            <if test="materialBarcode != null  and materialBarcode != ''"> and material_barcode = #{materialBarcode}</if>
-            <if test="materialId != null "> and material_id = #{materialId}</if>
-            <if test="instockBatch != null  and instockBatch != ''"> and instock_batch = #{instockBatch}</if>
-            <if test="materialProductionDate != null "> and material_production_Date = #{materialProductionDate}</if>
-            <if test="planAmount != null "> and plan_amount = #{planAmount}</if>
+            <if test="materialBarcode != null  and materialBarcode != ''"> and wrod.material_barcode = #{materialBarcode}</if>
+            <if test="materialId != null "> and wrod.material_id = #{materialId}</if>
+            <if test="instockBatch != null  and instockBatch != ''"> and wrod.instock_batch = #{instockBatch}</if>
+            <if test="materialProductionDate != null "> and wrod.material_production_Date = #{materialProductionDate}</if>
+            <if test="planAmount != null "> and wrod.plan_amount = #{planAmount}</if>
 
-            <if test="executeStatusStr != null  and executeStatusStr != ''"> and execute_status in (${executeStatusStr})</if>
-            <if test="erpStatus != null  and erpStatus != ''"> and erp_status = #{erpStatus}</if>
-            <if test="outstockPerson != null  and outstockPerson != ''"> and outstock_person = #{outstockPerson}</if>
-            <if test="outstockTime != null "> and outstock_time = #{outstockTime}</if>
-            <if test="outstockWay != null  and outstockWay != ''"> and outstock_way = #{outstockWay}</if>
-            <if test="machineName != null  and machineName != ''"> and machine_name like concat('%', #{machineName}, '%')</if>
-            <if test="qualityStatus != null  and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
-            <if test="createDate != null "> and create_date = #{createDate}</if>
-            <if test="updateDate != null "> and update_date = #{updateDate}</if>
+            <if test="executeStatusStr != null  and executeStatusStr != ''"> and wrod.execute_status in (${executeStatusStr})</if>
+            <if test="erpStatus != null  and erpStatus != ''"> and wrod.erp_status = #{erpStatus}</if>
+            <if test="outstockPerson != null  and outstockPerson != ''"> and wrod.outstock_person = #{outstockPerson}</if>
+            <if test="outstockTime != null "> and wrod.outstock_time = #{outstockTime}</if>
+            <if test="outstockWay != null  and outstockWay != ''"> and wrod.outstock_way = #{outstockWay}</if>
+            <if test="machineName != null  and machineName != ''"> and wrod.machine_name like concat('%', #{machineName}, '%')</if>
+            <if test="qualityStatus != null  and qualityStatus != ''"> and wrod.quality_status = #{qualityStatus}</if>
+            <if test="createDate != null "> and wrod.create_date = #{createDate}</if>
+            <if test="updateDate != null "> and wrod.update_date = #{updateDate}</if>
+            <if test="taskCode != null  and taskCode != ''"> and wro.task_code like concat('%', #{taskCode}, '%')</if>
+            <if test="planCode != null  and planCode != ''"> and wro.plan_code like concat('%', #{planCode}, '%')</if>
+            <if test="planDetailCode != null  and planDetailCode != ''"> and wro.plan_detail_code like concat('%', #{planDetailCode}, '%')</if>
+            <if test="saleorderCode != null  and saleorderCode != ''"> and mso.saleorder_code like concat('%', #{saleorderCode}, '%')</if>
+            <if test="materialCode != null  and materialCode != ''"> and mbmi.material_code like concat('%', #{materialCode}, '%')</if>
+            <if test="materialName != null  and materialName != ''"> and mbmi.material_name like concat('%', #{materialName}, '%')</if>
         </where>
     </select>
 
     <select id="selectWmsRawOutstockDetailByRawOutstockDetailId" parameterType="Long" resultMap="WmsRawOutstockDetailResult">
         <include refid="selectWmsRawOutstockDetailVo"/>
-        where raw_outstock_detail_id = #{rawOutstockDetailId}
+        where wrod.raw_outstock_detail_id = #{rawOutstockDetailId}
     </select>
 
     <insert id="insertWmsRawOutstockDetail" parameterType="WmsRawOutstockDetail" useGeneratedKeys="true" keyProperty="rawOutstockDetailId">
@@ -98,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateDate != null">update_date,</if>
             <if test="stackAmount != null">stack_amount,</if>
+            <if test="tips != null">tips,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="rawOutstockId != null">#{rawOutstockId},</if>
@@ -120,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateDate != null">#{updateDate},</if>
             <if test="stackAmount != null">#{stackAmount},</if>
+            <if test="tips != null">#{tips},</if>
          </trim>
     </insert>
 
@@ -165,8 +210,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectWmsManualRawOutstockDetail"  resultMap="WmsRawOutstockDetailResult">
         <include refid="selectWmsRawOutstockDetailVo"/>
-        where raw_outstock_id = #{rawOutstockId} and location_code = #{locationCode} and material_barcode = #{materialBarcode}
-        and outstock_way='1' limit 1
+        where wrod.raw_outstock_id = #{rawOutstockId} and wrod.location_code = #{locationCode} and wrod.material_barcode = #{materialBarcode}
+        and wrod.outstock_way='1' limit 1
     </select>
 
 
@@ -239,7 +284,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mpo.price,
         mpo.specification_parameter,
         mpp.product_id,
-        mpp.tond_base_id
+        mpp.tond_base_id,
+        wrod.tips
         from wms_raw_outstock_detail wrod
         left join wms_raw_outstock wro on wrod.raw_outstock_id = wro.raw_outstock_id
         left join mes_base_material_info mbmi on mbmi.material_id = wro.material_id

hw-ui/src/api/wms/rawOutstockDetail.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询原材料出库记录明细列表
+export function listRawOutstockDetail(query) {
+  return request({
+    url: '/wms/rawOutstockDetail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询原材料出库记录明细详细
+export function getRawOutstockDetail(rawOutstockDetailId) {
+  return request({
+    url: '/wms/rawOutstockDetail/' + rawOutstockDetailId,
+    method: 'get'
+  })
+}
+
+// 新增原材料出库记录明细
+export function addRawOutstockDetail(data) {
+  return request({
+    url: '/wms/rawOutstockDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改原材料出库记录明细
+export function updateRawOutstockDetail(data) {
+  return request({
+    url: '/wms/rawOutstockDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原材料出库记录明细
+export function delRawOutstockDetail(rawOutstockDetailId) {
+  return request({
+    url: '/wms/rawOutstockDetail/' + rawOutstockDetailId,
+    method: 'delete'
+  })
+}
+
+// 关联销售订单
+export function relateSaleOrder(data) {
+  return request({
+    url: '/wms/rawoutstock/relateSaleOrder',
+    method: 'post',
+    data: data
+  })
+}

hw-ui/src/views/mes/purchaseOrder/addMultiplePurchaseOrder.vue

@@ -18,27 +18,27 @@
         />
       </el-form-item>
 
-      <el-form-item label="可用标识" v-if="queryParams.mergeFlag!==null" prop="mergeFlag">
-        <el-radio-group v-model="queryParams.mergeFlag">
-          <el-radio label="1" value="1" >
-            是
-          </el-radio>
-          <el-radio label="" value="" >
-            否
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
+<!--      <el-form-item label="可用标识" v-if="queryParams.mergeFlag!==null" prop="mergeFlag">-->
+<!--        <el-radio-group v-model="queryParams.mergeFlag">-->
+<!--          <el-radio label="1" value="1" >-->
+<!--            是-->
+<!--          </el-radio>-->
+<!--          <el-radio label="" value="" >-->
+<!--            否-->
+<!--          </el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
 
-      <el-form-item label="可用标识" v-if="queryParams.mergeFlag===null" prop="singleFlag">
-        <el-radio-group v-model="queryParams.singleFlag">
-          <el-radio label="1" value="1" >
-            是
-          </el-radio>
-          <el-radio label="" value="" >
-            否
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
+<!--      <el-form-item label="可用标识" v-if="queryParams.mergeFlag===null" prop="singleFlag">-->
+<!--        <el-radio-group v-model="queryParams.singleFlag">-->
+<!--          <el-radio label="1" value="1" >-->
+<!--            是-->
+<!--          </el-radio>-->
+<!--          <el-radio label="" value="" >-->
+<!--            否-->
+<!--          </el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
 
 
 
@@ -82,13 +82,13 @@
       </el-table-column>
       <!--      <el-table-column label="绑定数量" align="center" prop="bindAmount" />-->
       <!--      <el-table-column label="条码数量" align="center" prop="barcodeAmount" />-->
-      <el-table-column label="采购数量" align="center" prop="orderAmount" />
-      <el-table-column label="可用数量" align="center" prop="relateSaleOrderAmount" />
-      <el-table-column label="销售订单" align="center" prop="saleOrderCode" />
-      <el-table-column label="成品编码" align="center" prop="productCode" />
-      <el-table-column label="成品名称" align="center" prop="productName" />
-      <el-table-column label="成品规格" align="center" prop="productSpec"/>
-      <el-table-column label="销售数量" align="center" prop="saleOrderAmount" />
+<!--      <el-table-column label="采购数量" align="center" prop="orderAmount" />-->
+      <el-table-column label="收料数量" align="center" prop="relateSaleOrderAmount" />
+<!--      <el-table-column label="销售订单" align="center" prop="saleOrderCode" />-->
+<!--      <el-table-column label="成品编码" align="center" prop="productCode" />-->
+<!--      <el-table-column label="成品名称" align="center" prop="productName" />-->
+<!--      <el-table-column label="成品规格" align="center" prop="productSpec"/>-->
+<!--      <el-table-column label="销售数量" align="center" prop="saleOrderAmount" />-->
     </el-table>
 
     <pagination
@@ -235,12 +235,12 @@ export default {
     getData() {
       if (this.defineData.mergeFlag) {
         this.selectionVisible = true;
-        this.queryParams.mergeFlag = "1";
+        this.queryParams.mergeFlag = "";
         this.queryParams.singleFlag = null;
         this.isSingleSelect = false;
       }else{
         this.selectionVisible = false;
-        this.queryParams.singleFlag ="1";
+        this.queryParams.singleFlag ="";
         this.queryParams.mergeFlag = null;
         this.isSingleSelect = false;
       }
@@ -254,13 +254,14 @@ export default {
       }
       this.loading = true;
       getPurchaseOrdersWithBind(this.queryParams).then(response => {
-        response.rows.forEach(e => {
-          if(e.orderBindId){
-            e.relateSaleOrderAmount = e.bindAmount - e.barcodeAmount;
-          }
+        response.rows.forEach((e, i) => {
+          // if(e.orderBindId){
+          //   e.relateSaleOrderAmount = e.bindAmount - e.barcodeAmount;
+          // }
+          e.relateSaleOrderAmount = e.actLandAmount
           e.receiveBillId = this.queryParams.receiveBillId;
           // 添加rowKey作为唯一标识
-          e.rowKey = e.purchaseOrderId + '-' + e.orderBindId;
+          e.rowKey = e.purchaseOrderId + '-' + i;
         });
 
         this.orderBindList = response.rows;

hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue

@@ -72,16 +72,16 @@
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="可用标识" v-if="queryParams.mergeFlag===null" prop="singleFlag">
-        <el-radio-group v-model="queryParams.singleFlag">
-          <el-radio label="1" value="1" >
-            是
-          </el-radio>
-          <el-radio label="" value="" >
-            否
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
+<!--      <el-form-item label="可用标识" v-if="queryParams.mergeFlag===null" prop="singleFlag" >-->
+<!--        <el-radio-group v-model="queryParams.singleFlag">-->
+<!--          <el-radio label="1" value="1" >-->
+<!--            是-->
+<!--          </el-radio>-->
+<!--          <el-radio label="" value="" >-->
+<!--            否-->
+<!--          </el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
 
 
 
@@ -114,7 +114,7 @@
         :reserve-selection="true"
         v-if="!isSingleSelect"
       ></el-table-column>
-      <el-table-column label="采购订单ID" align="center" prop="purchaseOrderId"  />
+      <el-table-column label="采购订单ID" align="center" prop="purchaseOrderId"  width="90"/>
       <el-table-column label="采购订单" align="center" prop="poNo"  />
       <el-table-column label="物料编码" align="center" prop="materialCode" />
       <el-table-column label="物料名称" align="center" prop="materialName" />
@@ -127,13 +127,13 @@
       </el-table-column>
 <!--      <el-table-column label="绑定数量" align="center" prop="bindAmount" />-->
 <!--      <el-table-column label="条码数量" align="center" prop="barcodeAmount" />-->
-      <el-table-column label="采购数量" align="center" prop="orderAmount" />
-      <el-table-column label="可用数量" align="center" prop="relateSaleOrderAmount" />
-      <el-table-column label="销售订单" align="center" prop="saleOrderCode" />
-      <el-table-column label="成品编码" align="center" prop="productCode" />
-      <el-table-column label="成品名称" align="center" prop="productName" />
-      <el-table-column label="成品规格" align="center" prop="productSpec"/>
-      <el-table-column label="销售数量" align="center" prop="saleOrderAmount" />
+<!--      <el-table-column label="采购数量" align="center" prop="orderAmount" />-->
+      <el-table-column label="收料数量" align="center" prop="relateSaleOrderAmount" />
+<!--      <el-table-column label="销售订单" align="center" prop="saleOrderCode" />-->
+<!--      <el-table-column label="成品编码" align="center" prop="productCode" />-->
+<!--      <el-table-column label="成品名称" align="center" prop="productName" />-->
+<!--      <el-table-column label="成品规格" align="center" prop="productSpec"/>-->
+<!--      <el-table-column label="销售数量" align="center" prop="saleOrderAmount" />-->
     </el-table>
 
     <pagination
@@ -280,12 +280,12 @@ export default {
     getData() {
       if (this.defineData.mergeFlag) {
         this.selectionVisible = true;
-        this.queryParams.mergeFlag = "1";
+        this.queryParams.mergeFlag = "";
         this.queryParams.singleFlag = null;
         this.isSingleSelect = false;
       }else{
         this.selectionVisible = false;
-        this.queryParams.singleFlag ="1";
+        this.queryParams.singleFlag ="";
         this.queryParams.mergeFlag = null;
         this.isSingleSelect = true;
       }
@@ -301,10 +301,10 @@ export default {
       this.loading = true;
       getPurchaseOrdersWithBind(this.queryParams).then(response => {
         response.rows.forEach(e => {
-          if(e.orderBindId){
-            e.relateSaleOrderAmount = e.bindAmount - e.barcodeAmount;
-          }
-
+          // if(e.orderBindId){
+          //   e.relateSaleOrderAmount = e.bindAmount - e.barcodeAmount;
+          // }
+          e.relateSaleOrderAmount = e.actLandAmount
         });
 
         this.orderBindList = response.rows;

hw-ui/src/views/wms/info/rawOutstockDetail/index.vue

@@ -0,0 +1,743 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+             label-width="80px">
+      <el-form-item label="任务编号" prop="taskCode">
+        <el-input
+          v-model="queryParams.taskCode"
+          placeholder="请输入任务编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划编号" prop="planCode">
+        <el-input
+          v-model="queryParams.planCode"
+          placeholder="请输入计划编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="明细编号" prop="planDetailCode">
+        <el-input
+          v-model="queryParams.planDetailCode"
+          placeholder="请输入计划明细编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料编码" prop="materialCode">
+        <el-input
+          v-model="queryParams.materialCode"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="库位编码" prop="locationCode">
+        <el-input
+          v-model="queryParams.locationCode"
+          placeholder="请输入库位编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料条码" prop="materialBarcode">
+        <el-input
+          v-model="queryParams.materialBarcode"
+          placeholder="请输入物料条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--      <el-form-item label="物料ID" prop="materialId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.materialId"-->
+      <!--          placeholder="请输入物料ID"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="批次" prop="instockBatch">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.instockBatch"-->
+      <!--          placeholder="请输入批次"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="执行状态" prop="executeStatus">
+        <el-select v-model="queryParams.executeStatus" placeholder="请选择执行状态"
+                   clearable>
+          <el-option
+            v-for="dict in dict.type.wms_execute_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="同步ERP状态" prop="erpStatus" label-width="120">
+        <el-select v-model="queryParams.erpStatus" placeholder="请选择同步ERP状态" clearable>
+          <el-option
+            v-for="dict in dict.type.wms_erp_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <!--      <el-form-item label="出库时间" prop="outstockTime">-->
+      <!--        <el-date-picker clearable-->
+      <!--                        v-model="queryParams.outstockTime"-->
+      <!--                        type="date"-->
+      <!--                        value-format="yyyy-MM-dd"-->
+      <!--                        placeholder="请选择出库时间">-->
+      <!--        </el-date-picker>-->
+      <!--      </el-form-item>-->
+
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['wms:rawOutstockDetail:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="rawOutstockDetailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="原材料出库记录明细ID" align="center" prop="rawOutstockDetailId" width="160"
+                       v-if="columns[0].visible"/>
+      <el-table-column label="原材料出库ID" align="center" prop="rawOutstockId" width="140" v-if="columns[1].visible"/>
+      <el-table-column label="任务编号" align="center" prop="taskCode" width="140" v-if="columns[25].visible"/>
+      <el-table-column label="计划编号" align="center" prop="planCode" width="140" v-if="columns[26].visible"/>
+      <el-table-column label="计划明细编号" align="center" prop="planDetailCode" width="140"
+                       v-if="columns[27].visible"/>
+      <el-table-column label="销售订单编号" align="center" prop="saleorderCode" width="140" v-if="columns[28].visible"/>
+      <el-table-column label="仓库ID" align="center" prop="warehouseId" width="120" v-if="columns[3].visible"/>
+      <el-table-column label="库位编码" align="center" prop="locationCode" width="120" v-if="columns[4].visible"/>
+      <el-table-column label="物料条码" align="center" prop="materialBarcode" width="160" v-if="columns[5].visible"/>
+      <el-table-column label="物料ID" align="center" prop="materialId" width="80" v-if="columns[6].visible"/>
+      <el-table-column label="物料编号" align="center" prop="materialCode" width="120" v-if="columns[29].visible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" width="120" v-if="columns[30].visible"/>
+      <el-table-column label="批次" align="center" prop="instockBatch" width="120" v-if="columns[7].visible"/>
+      <el-table-column label="生产日期" align="center" prop="materialProductionDate"
+                       width="180"
+                       v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.materialProductionDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="计划数量" align="center" prop="planAmount" width="100" v-if="columns[9].visible"/>
+      <el-table-column label="出库数量" align="center" prop="outstockAmount" width="100" v-if="columns[10].visible"/>
+      <el-table-column label="执行状态" align="center" prop="executeStatus"
+                       v-if="columns[11].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.wms_execute_status" :value="scope.row.executeStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="同步ERP状态" align="center" prop="erpStatus"
+                       v-if="columns[12].visible" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.wms_erp_status" :value="scope.row.erpStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="同步ERP数量" align="center" prop="erpAmount" width="100" v-if="columns[13].visible"/>
+      <el-table-column label="出库人" align="center" prop="outstockPerson" width="100" v-if="columns[14].visible"/>
+      <el-table-column label="出库时间" align="center" prop="outstockTime" width="180"
+                       v-if="columns[15].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.outstockTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="出库方式" align="center" prop="outstockWay"
+                       v-if="columns[16].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.wms_product_outstock_manualflag" :value="scope.row.outstockWay"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="使用机台名称" align="center" prop="machineName" width="140" v-if="columns[17].visible"/>
+      <el-table-column label="质检状态" align="center" prop="qualityStatus"
+                       v-if="columns[18].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.qms_check_status" :value="scope.row.qualityStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createDate" width="180"
+                       v-if="columns[20].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="最后更新时间" align="center" prop="updateDate" width="180"
+                       v-if="columns[22].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="每托数量" align="center" prop="stackAmount" width="100" v-if="columns[23].visible"/>
+      <el-table-column label="备注" align="center" prop="tips" width="120" v-if="columns[24].visible"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
+        <template slot-scope="scope">
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            @click="handleUpdate(scope.row)"-->
+          <!--            v-hasPermi="['wms:rawOutstockDetail:edit']"-->
+          <!--          >修改-->
+          <!--          </el-button>-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-delete"-->
+          <!--            @click="handleDelete(scope.row)"-->
+          <!--            v-hasPermi="['wms:rawOutstockDetail:remove']"-->
+          <!--          >删除-->
+          <!--          </el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-link"
+            v-if="scope.row.executeStatus == '2' && scope.row.erpStatus !== '1'"
+            @click="handleRelateSaleOrder(scope.row)"
+          >
+            关联销售订单
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改原材料出库记录明细对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="原材料出库ID" prop="rawOutstockId">
+          <el-input v-model="form.rawOutstockId" placeholder="请输入原材料出库ID"/>
+        </el-form-item>
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID"/>
+        </el-form-item>
+        <el-form-item label="库位编码" prop="locationCode">
+          <el-input v-model="form.locationCode" placeholder="请输入库位编码"/>
+        </el-form-item>
+        <el-form-item label="物料条码" prop="materialBarcode">
+          <el-input v-model="form.materialBarcode" placeholder="请输入物料条码"/>
+        </el-form-item>
+        <el-form-item label="物料ID" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入物料ID"/>
+        </el-form-item>
+        <el-form-item label="批次" prop="instockBatch">
+          <el-input v-model="form.instockBatch" placeholder="请输入批次"/>
+        </el-form-item>
+        <el-form-item label="生产日期" prop="materialProductionDate">
+          <el-date-picker clearable
+                          v-model="form.materialProductionDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择生产日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划数量" prop="planAmount">
+          <el-input v-model="form.planAmount" placeholder="请输入计划数量"/>
+        </el-form-item>
+        <el-form-item label="出库数量" prop="outstockAmount">
+          <el-input v-model="form.outstockAmount" placeholder="请输入出库数量"/>
+        </el-form-item>
+        <el-form-item label="执行状态" prop="executeStatus">
+          <el-radio-group v-model="form.executeStatus">
+            <el-radio
+              v-for="dict in dict.type.wms_execute_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="同步ERP状态" prop="erpStatus">
+          <el-radio-group v-model="form.erpStatus">
+            <el-radio
+              v-for="dict in dict.type.wms_erp_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="同步ERP数量" prop="erpAmount">
+          <el-input v-model="form.erpAmount" placeholder="请输入同步ERP数量"/>
+        </el-form-item>
+        <el-form-item label="出库人" prop="outstockPerson">
+          <el-input v-model="form.outstockPerson" placeholder="请输入出库人"/>
+        </el-form-item>
+        <el-form-item label="出库时间" prop="outstockTime">
+          <el-date-picker clearable
+                          v-model="form.outstockTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择出库时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="出库方式" prop="outstockWay">
+          <el-radio-group v-model="form.outstockWay">
+            <el-radio
+              v-for="dict in dict.type.wms_product_outstock_manualflag"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="使用机台名称" prop="machineName">
+          <el-input v-model="form.machineName" placeholder="请输入使用机台名称"/>
+        </el-form-item>
+        <el-form-item label="质检状态" prop="qualityStatus">
+          <el-radio-group v-model="form.qualityStatus">
+            <el-radio
+              v-for="dict in dict.type.qms_check_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createDate">
+          <el-date-picker clearable
+                          v-model="form.createDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="最后更新时间" prop="updateDate">
+          <el-date-picker clearable
+                          v-model="form.updateDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择最后更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="每托数量" prop="stackAmount">
+          <el-input v-model="form.stackAmount" placeholder="请输入每托数量"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="tips">
+          <el-input v-model="form.tips" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 关联销售订单对话框 -->
+    <el-dialog
+      title="关联销售订单"
+      :visible.sync="relateSaleOrderDialogVisible"
+      width="900px"
+      append-to-body
+    >
+      <!-- 优化：顶部明细信息卡片 -->
+      <el-card shadow="never" style="margin-bottom: 18px; background: #f8f8f8; border-radius: 6px;">
+        <el-row :gutter="16">
+          <el-col :span="8"><b>任务编号：</b><span style="color:#333">{{ relateSaleOrderForm.taskCode || getCurrentDetail('taskCode') }}</span></el-col>
+          <el-col :span="8"><b>计划编号：</b><span style="color:#333">{{ relateSaleOrderForm.planCode || getCurrentDetail('planCode') }}</span></el-col>
+          <el-col :span="8"><b>物料编号：</b><span style="color:#333">{{ relateSaleOrderForm.materialCode || getCurrentDetail('materialCode') }}</span></el-col>
+        </el-row>
+        <el-row :gutter="16" style="margin-top: 8px;">
+          <el-col :span="8"><b>物料名称：</b><span style="color:#333">{{ relateSaleOrderForm.materialName || getCurrentDetail('materialName') }}</span></el-col>
+          <el-col :span="8"><b>计划数量：</b><span style="color:#333">{{ relateSaleOrderForm.planAmount || getCurrentDetail('planAmount') }}</span></el-col>
+          <el-col :span="8"><b>出库数量：</b><span style="color:#333">{{ relateSaleOrderForm.outstockAmount || getCurrentDetail('outstockAmount') }}</span></el-col>
+        </el-row>
+      </el-card>
+      <!-- 优化：每条销售订单卡片分隔 -->
+      <el-form :model="relateSaleOrderForm" label-width="0px" style="margin-bottom: 0;">
+        <div v-for="(item, index) in relateSaleOrderForm.saleOrders" :key="index" style="margin-bottom: 14px;">
+          <el-card shadow="never" style="background: #fcfcfc; border-radius: 6px; padding: 12px 12px 0 12px;">
+            <el-row :gutter="12" align="middle">
+              <el-col :span="7">
+                <el-form-item style="margin-bottom: 10px;">
+                  <el-input
+                    v-model="item.saleorderCode"
+                    placeholder="请选择销售订单"
+                    style="width: 100%; height: 36px;"
+                    readonly
+                  >
+                    <el-button slot="append" icon="el-icon-search" @click="openSaleOrderSelect(index)"></el-button>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item style="margin-bottom: 10px;">
+                  <el-input
+                    v-model="item.materialCode"
+                    placeholder="物料编码"
+                    style="width: 100%; height: 36px;"
+                    readonly
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item style="margin-bottom: 10px;">
+                  <el-input
+                    v-model="item.materialName"
+                    placeholder="物料名称"
+                    style="width: 100%; height: 36px;"
+                    readonly
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item style="margin-bottom: 10px;">
+                  <el-input-number
+                    v-model="item.outstockAmount"
+                    :min="0.0001"
+                    placeholder="出库数量"
+                    style="width: 100%; height: 36px;"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="2" style="text-align: right;">
+                <el-button
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="removeSaleOrder(index)"
+                  v-if="relateSaleOrderForm.saleOrders.length > 1"
+                  style="margin-top: 2px;"
+                />
+              </el-col>
+            </el-row>
+          </el-card>
+        </div>
+        <el-form-item style="margin-top: 0;">
+          <el-button type="primary" icon="el-icon-plus" @click="addSaleOrder">添加销售订单</el-button>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitRelateSaleOrder">确 定</el-button>
+        <el-button @click="relateSaleOrderDialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 选择销售订单弹窗 -->
+    <el-dialog title="选择销售订单" :visible.sync="saleOrderSelectDialogVisible" append-to-body>
+      <add-SaleOrder @selection="handleSaleOrderSelected" ref="saleOrderRef"></add-SaleOrder>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitSaleOrderSelect">确 定</el-button>
+        <el-button @click="saleOrderSelectDialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {
+  listRawOutstockDetail,
+  getRawOutstockDetail,
+  delRawOutstockDetail,
+  addRawOutstockDetail,
+  updateRawOutstockDetail,
+  relateSaleOrder
+} from "@/api/wms/rawOutstockDetail";
+import addSaleOrder from '@/views/mes/productOrder/addSaleOrder.vue';
+
+export default {
+  name: "RawOutstockDetail",
+  dicts: ['wms_product_outstock_manualflag', 'qms_check_status', 'wms_erp_status', 'wms_execute_status', 'wms_audit_status', 'wms_raw_outstock_task_type'],
+  components: {
+    'add-SaleOrder': addSaleOrder,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 原材料出库记录明细表格数据
+      rawOutstockDetailList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        rawOutstockId: null,
+        taskCode: null,
+        warehouseId: null,
+        locationCode: null,
+        materialBarcode: null,
+        materialId: null,
+        instockBatch: null,
+        materialProductionDate: null,
+        planAmount: null,
+        outstockAmount: null,
+        executeStatus: null,
+        erpStatus: null,
+        erpAmount: null,
+        outstockPerson: null,
+        outstockTime: null,
+        outstockWay: null,
+        machineName: null,
+        qualityStatus: null,
+        createDate: null,
+        updateDate: null,
+        stackAmount: null,
+        tips: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        outstockWay: [
+          {
+            required: true, message: "出库方式不能为空", trigger: "change"
+          }
+        ],
+      },
+      columns: [
+        {key: 0, label: `原材料出库记录明细ID`, visible: false},
+        {key: 1, label: `原材料出库ID`, visible: false},
+        {key: 2, label: `原材料出库任务编号`, visible: false},
+        {key: 3, label: `仓库ID`, visible: false},
+        {key: 4, label: `库位编码`, visible: true},
+        {key: 5, label: `物料条码`, visible: true},
+        {key: 6, label: `物料ID`, visible: true},
+        {key: 7, label: `批次`, visible: true},
+        {key: 8, label: `生产日期`, visible: false},
+        {key: 9, label: `计划数量`, visible: true},
+        {key: 10, label: `出库数量`, visible: true},
+        {key: 11, label: `执行状态`, visible: true},
+        {key: 12, label: `同步ERP状态`, visible: true},
+        {key: 13, label: `同步ERP数量`, visible: true},
+        {key: 14, label: `出库人`, visible: true},
+        {key: 15, label: `出库时间`, visible: true},
+        {key: 16, label: `出库方式`, visible: true},
+        {key: 17, label: `使用机台名称`, visible: false},
+        {key: 18, label: `质检状态`, visible: false},
+        {key: 19, label: `创建人`, visible: false},
+        {key: 20, label: `创建时间`, visible: false},
+        {key: 21, label: `最后更新人`, visible: false},
+        {key: 22, label: `最后更新时间`, visible: false},
+        {key: 23, label: `每托数量`, visible: false},
+        {key: 24, label: `备注`, visible: true},
+        {key: 25, label: `任务编号`, visible: true},
+        {key: 26, label: `计划编号`, visible: true},
+        {key: 27, label: `计划明细编号`, visible: true},
+        {key: 28, label: `销售订单编号`, visible: true},
+        {key: 29, label: `物料编号`, visible: true},
+        {key: 30, label: `物料名称`, visible: true},
+      ],
+      relateSaleOrderDialogVisible: false,
+      relateSaleOrderForm: {
+        rawOutstockDetailId: null,
+        saleOrders: [
+          // { saleorderCode: '', outstockAmount: 0 }
+        ]
+      },
+      saleOrderSelectDialogVisible: false,
+      saleOrderSelectIndex: 0, // 当前操作的saleOrders下标
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询原材料出库记录明细列表 */
+    getList() {
+      this.loading = true;
+      listRawOutstockDetail(this.queryParams).then(response => {
+        this.rawOutstockDetailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        rawOutstockDetailId: null,
+        rawOutstockId: null,
+        taskCode: null,
+        warehouseId: null,
+        locationCode: null,
+        materialBarcode: null,
+        materialId: null,
+        instockBatch: null,
+        materialProductionDate: null,
+        planAmount: null,
+        outstockAmount: null,
+        executeStatus: null,
+        erpStatus: null,
+        erpAmount: null,
+        outstockPerson: null,
+        outstockTime: null,
+        outstockWay: null,
+        machineName: null,
+        qualityStatus: null,
+        createBy: null,
+        createDate: null,
+        updateBy: null,
+        updateDate: null,
+        stackAmount: null,
+        tips: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.rawOutstockDetailId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加原材料出库记录明细";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const rawOutstockDetailId = row.rawOutstockDetailId || this.ids
+      getRawOutstockDetail(rawOutstockDetailId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改原材料出库记录明细";
+      });
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/rawOutstockDetail/export', {
+        ...this.queryParams
+      }, `rawOutstockDetail_${new Date().getTime()}.xlsx`)
+    },
+
+    handleRelateSaleOrder(row) {
+      this.relateSaleOrderForm = {
+        rawOutstockDetailId: row.rawOutstockDetailId,
+        outstockAmount: row.outstockAmount,
+        saleOrders: [
+          {saleorderCode: '', outstockAmount: row.outstockAmount}
+        ]
+      };
+      this.relateSaleOrderDialogVisible = true;
+    },
+    addSaleOrder() {
+      // 新增一项并弹出选择销售订单弹窗
+      const newIndex = this.relateSaleOrderForm.saleOrders.length;
+      this.relateSaleOrderForm.saleOrders.push({saleorderCode: '', outstockAmount: 1});
+      this.saleOrderSelectIndex = newIndex;
+      this.saleOrderSelectDialogVisible = true;
+    },
+    removeSaleOrder(index) {
+      this.relateSaleOrderForm.saleOrders.splice(index, 1);
+    },
+    submitRelateSaleOrder() {
+      // 校验出库数量总和不能大于原出库数量
+      const total = this.relateSaleOrderForm.saleOrders.reduce((sum, item) => sum + Number(item.outstockAmount), 0);
+      // 新增校验：出库数量不能小于等于0
+      const hasInvalidAmount = this.relateSaleOrderForm.saleOrders.some(item => item.outstockAmount == null);
+      if (hasInvalidAmount) {
+        this.$message.error('出库数量不能为空！');
+        return;
+      }
+      // 这里假设原出库数量在第一个saleOrders的outstockAmount里
+      const originAmount = this.rawOutstockDetailList.find(
+        item => item.rawOutstockDetailId === this.relateSaleOrderForm.rawOutstockDetailId
+      )?.outstockAmount || 0;
+      if (total > originAmount) {
+        this.$message.error('出库数量总和不能大于原出库数量');
+        return;
+      }
+      // 发送请求到后端
+      relateSaleOrder(this.relateSaleOrderForm).then(res => {
+        this.$message.success('关联成功');
+        this.relateSaleOrderDialogVisible = false;
+        this.getList();
+      });
+    },
+    openSaleOrderSelect(index) {
+      this.saleOrderSelectIndex = index;
+      this.saleOrderSelectDialogVisible = true;
+    },
+    submitSaleOrderSelect() {
+      let selectedRow = this.$refs.saleOrderRef.selectedRow;
+      if (!selectedRow) {
+        this.$message.error('请选择销售订单');
+        return;
+      }
+      // 回填到对应的saleOrders项，增加物料编码和物料名称
+      this.$set(this.relateSaleOrderForm.saleOrders, this.saleOrderSelectIndex, {
+        ...this.relateSaleOrderForm.saleOrders[this.saleOrderSelectIndex],
+        saleOrderId: selectedRow.saleOrderId,
+        saleorderCode: selectedRow.saleorderCode,
+        materialCode: selectedRow.materialCode,
+        materialName: selectedRow.materialName,
+      });
+      this.saleOrderSelectDialogVisible = false;
+    },
+    getCurrentDetail(field) {
+      // 根据 rawOutstockDetailId 查找当前明细行
+      const detail = this.rawOutstockDetailList.find(item => item.rawOutstockDetailId === this.relateSaleOrderForm.rawOutstockDetailId) || {};
+      return detail[field] || '';
+    },
+  }
+}
+;
+</script>