3.5.2

生产：
增加销售订单分摊易耗品物料使用情况的说明

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

@@ -149,6 +149,7 @@ public class MesBaseMaterialInfo extends BaseEntity
 
     private String selectType;//3是选择实际生产的物料信息，需要过滤是到511仓库的物料
 
+    private BigDecimal stockAmount;//实际总库存
 
     public Long getPurchasePriceUnitId() {
         return purchasePriceUnitId;
@@ -458,6 +459,14 @@ public class MesBaseMaterialInfo extends BaseEntity
         this.selectType = selectType;
     }
 
+    public BigDecimal getStockAmount() {
+        return stockAmount;
+    }
+
+    public void setStockAmount(BigDecimal stockAmount) {
+        this.stockAmount = stockAmount;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java

@@ -163,4 +163,9 @@ public enum BusinessType
      * 暂停
      */
     PAUSE,
+
+    /**
+     * 使用
+     */
+    USE,
 }

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

@@ -0,0 +1,105 @@
+package com.hw.mes.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.mes.domain.MesAlarmInfo;
+import com.hw.mes.service.IMesAlarmInfoService;
+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 xins
+ * @date 2024-11-21
+ */
+@RestController
+@RequestMapping("/alarmInfo")
+public class MesAlarmInfoController extends BaseController
+{
+    @Autowired
+    private IMesAlarmInfoService mesAlarmInfoService;
+
+    /**
+     * 查询生产告警信息列表
+     */
+    @RequiresPermissions("mes:alarmInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo list(MesAlarmInfo mesAlarmInfo)
+    {
+        startPage();
+        List<MesAlarmInfo> list = mesAlarmInfoService.selectMesAlarmInfoList(mesAlarmInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出生产告警信息列表
+     */
+    @RequiresPermissions("mes:alarmInfo:export")
+    @Log(title = "生产告警信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MesAlarmInfo mesAlarmInfo)
+    {
+        List<MesAlarmInfo> list = mesAlarmInfoService.selectMesAlarmInfoList(mesAlarmInfo);
+        ExcelUtil<MesAlarmInfo> util = new ExcelUtil<MesAlarmInfo>(MesAlarmInfo.class);
+        util.exportExcel(response, list, "生产告警信息数据");
+    }
+
+    /**
+     * 获取生产告警信息详细信息
+     */
+    @RequiresPermissions("mes:alarmInfo:query")
+    @GetMapping(value = "/{alarmInfoId}")
+    public AjaxResult getInfo(@PathVariable("alarmInfoId") Long alarmInfoId)
+    {
+        return success(mesAlarmInfoService.selectMesAlarmInfoByAlarmInfoId(alarmInfoId));
+    }
+
+    /**
+     * 新增生产告警信息
+     */
+    @RequiresPermissions("mes:alarmInfo:add")
+    @Log(title = "生产告警信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MesAlarmInfo mesAlarmInfo)
+    {
+        return toAjax(mesAlarmInfoService.insertMesAlarmInfo(mesAlarmInfo));
+    }
+
+    /**
+     * 修改生产告警信息
+     */
+    @RequiresPermissions("mes:alarmInfo:edit")
+    @Log(title = "生产告警信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MesAlarmInfo mesAlarmInfo)
+    {
+        return toAjax(mesAlarmInfoService.updateMesAlarmInfo(mesAlarmInfo));
+    }
+
+    /**
+     * 删除生产告警信息
+     */
+    @RequiresPermissions("mes:alarmInfo:remove")
+    @Log(title = "生产告警信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{alarmInfoIds}")
+    public AjaxResult remove(@PathVariable Long[] alarmInfoIds)
+    {
+        return toAjax(mesAlarmInfoService.deleteMesAlarmInfoByAlarmInfoIds(alarmInfoIds));
+    }
+}

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

@@ -6,9 +6,11 @@ import javax.servlet.http.HttpServletResponse;
 import com.hw.common.core.domain.R;
 import com.hw.common.security.annotation.InnerAuth;
 import com.hw.mes.api.domain.MesBaseBarcodeInfo;
+import com.hw.mes.api.domain.MesBaseMaterialInfo;
 import com.hw.mes.api.domain.MesOrderBind;
 import com.hw.mes.api.domain.MesSaleOrderRelate;
 import com.hw.mes.api.domain.vo.MesSaleOrderTransferVo;
+import com.hw.mes.domain.MesSaleOrderMaterial;
 import com.hw.mes.service.IMesOrderBindService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -117,6 +119,39 @@ public class MesSaleOrderController extends BaseController {
 
 
 
+    @RequiresPermissions("mes:saleOrder:used")
+    @GetMapping("/selectMaterialOutstockUsedInfos")
+    public TableDataInfo selectMaterialOutstockUsedInfos(MesSaleOrderMaterial mesSaleOrderMaterial) {
+        startPage();
+        List<MesSaleOrderMaterial> list = mesSaleOrderService.selectSaleOrderMaterialUsedInfos(mesSaleOrderMaterial);
+        return getDataTable(list);
+    }
+
+    /**
+     * 修改销售订单信息
+     */
+    @RequiresPermissions("mes:saleOrder:used")
+    @Log(title = "销售订单物料使用", businessType = BusinessType.USE)
+    @PostMapping("/updateMesSaleOrderMaterials")
+    public AjaxResult updateMesSaleOrderMaterials(@RequestBody List<MesSaleOrderMaterial> mesSaleOrderMaterialList) {
+        return toAjax(mesSaleOrderService.updateMesSaleOrderMaterials(mesSaleOrderMaterialList));
+    }
+
+
+    /**
+     * 导出销售订单使用物料情况列表
+     */
+    @RequiresPermissions("mes:saleOrder:used")
+    @Log(title = "销售订单物料使用", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportSaleOrderMaterials")
+    public void exportSaleOrderMaterials(HttpServletResponse response, MesSaleOrderMaterial mesSaleOrderMaterial)
+    {
+        List<MesSaleOrderMaterial> list = mesSaleOrderService.selectMesSaleOrderMaterialList(mesSaleOrderMaterial);
+        ExcelUtil<MesSaleOrderMaterial> util = new ExcelUtil<MesSaleOrderMaterial>(MesSaleOrderMaterial.class);
+        util.exportExcel(response, list, "销售订单使用物料情况数据");
+    }
+
+
     /**
      * 库存转销售订单
      */

hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesAlarmInfo.java

@@ -0,0 +1,114 @@
+package com.hw.mes.domain;
+
+import java.util.List;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.hw.common.core.annotation.Excel;
+import com.hw.common.core.web.domain.BaseEntity;
+
+/**
+ * 生产告警信息对象 mes_alarm_info
+ * 
+ * @author xins
+ * @date 2024-11-21
+ */
+public class MesAlarmInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键标识 */
+    private Long alarmInfoId;
+
+    /** 报警类型(1库存报警) */
+    @Excel(name = "报警类型(1库存报警)")
+    private String alarmInfoType;
+
+    /** 处理状态(0未处理 1已处理) */
+    @Excel(name = "处理状态(0未处理 1已处理)")
+    private String handleStatus;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createDate;
+
+    /** 最后更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updateDate;
+
+    /** 库存告警信息明细信息 */
+    private List<MesStockAlarmDetail> mesStockAlarmDetailList;
+
+    public void setAlarmInfoId(Long alarmInfoId) 
+    {
+        this.alarmInfoId = alarmInfoId;
+    }
+
+    public Long getAlarmInfoId() 
+    {
+        return alarmInfoId;
+    }
+    public void setAlarmInfoType(String alarmInfoType) 
+    {
+        this.alarmInfoType = alarmInfoType;
+    }
+
+    public String getAlarmInfoType() 
+    {
+        return alarmInfoType;
+    }
+    public void setHandleStatus(String handleStatus) 
+    {
+        this.handleStatus = handleStatus;
+    }
+
+    public String getHandleStatus() 
+    {
+        return handleStatus;
+    }
+    public void setCreateDate(Date createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public Date getCreateDate() 
+    {
+        return createDate;
+    }
+    public void setUpdateDate(Date updateDate) 
+    {
+        this.updateDate = updateDate;
+    }
+
+    public Date getUpdateDate() 
+    {
+        return updateDate;
+    }
+
+    public List<MesStockAlarmDetail> getMesStockAlarmDetailList()
+    {
+        return mesStockAlarmDetailList;
+    }
+
+    public void setMesStockAlarmDetailList(List<MesStockAlarmDetail> mesStockAlarmDetailList)
+    {
+        this.mesStockAlarmDetailList = mesStockAlarmDetailList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("alarmInfoId", getAlarmInfoId())
+            .append("alarmInfoType", getAlarmInfoType())
+            .append("handleStatus", getHandleStatus())
+            .append("createBy", getCreateBy())
+            .append("createDate", getCreateDate())
+            .append("updateBy", getUpdateBy())
+            .append("updateDate", getUpdateDate())
+            .append("mesStockAlarmDetailList", getMesStockAlarmDetailList())
+            .toString();
+    }
+}

hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrderMaterial.java

@@ -0,0 +1,185 @@
+package com.hw.mes.domain;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.hw.common.core.annotation.Excel;
+import com.hw.common.core.web.domain.BaseEntity;
+
+/**
+ * 销售订单使用物料情况对象 mes_sale_order_material
+ * 
+ * @author xins
+ * @date 2024-11-21
+ */
+public class MesSaleOrderMaterial extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键标识 */
+    private Long saleOrderMaterialId;
+
+    /** 销售订单编号 */
+    @Excel(name = "销售订单编号")
+    private String saleorderCode;
+
+    /** 物料ID */
+//    @Excel(name = "物料ID")
+    private Long materialId;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 物料规格 */
+    @Excel(name = "物料规格")
+    private String materialSpec;
+
+    /** 出库数量 */
+//    @Excel(name = "出库数量")
+    private BigDecimal outstockAmount;
+
+    /** 分摊使用的数量 */
+    @Excel(name = "使用数量")
+    private BigDecimal usedAmount;
+
+    private BigDecimal realOutstockAmount;//实际出库数量
+
+    private BigDecimal totalUsedAmount;//总共分摊使用数量
+
+    private BigDecimal oriUsedAmount;//修改前的原分摊使用数量
+
+    private int index;//序号
+
+    public void setSaleOrderMaterialId(Long saleOrderMaterialId) 
+    {
+        this.saleOrderMaterialId = saleOrderMaterialId;
+    }
+
+    public Long getSaleOrderMaterialId() 
+    {
+        return saleOrderMaterialId;
+    }
+    public void setSaleorderCode(String saleorderCode) 
+    {
+        this.saleorderCode = saleorderCode;
+    }
+
+    public String getSaleorderCode() 
+    {
+        return saleorderCode;
+    }
+    public void setMaterialId(Long materialId) 
+    {
+        this.materialId = materialId;
+    }
+
+    public Long getMaterialId() 
+    {
+        return materialId;
+    }
+    public void setMaterialCode(String materialCode) 
+    {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialCode() 
+    {
+        return materialCode;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setMaterialSpec(String materialSpec) 
+    {
+        this.materialSpec = materialSpec;
+    }
+
+    public String getMaterialSpec() 
+    {
+        return materialSpec;
+    }
+    public void setOutstockAmount(BigDecimal outstockAmount) 
+    {
+        this.outstockAmount = outstockAmount;
+    }
+
+    public BigDecimal getOutstockAmount() 
+    {
+        return outstockAmount;
+    }
+    public void setUsedAmount(BigDecimal usedAmount) 
+    {
+        usedAmount = usedAmount == null ? BigDecimal.ZERO : usedAmount;
+        usedAmount = usedAmount.setScale(2, RoundingMode.HALF_UP);
+
+        this.usedAmount = usedAmount;
+    }
+
+    public BigDecimal getUsedAmount() 
+    {
+        return usedAmount;
+    }
+
+    public BigDecimal getRealOutstockAmount() {
+        return realOutstockAmount;
+    }
+
+    public void setRealOutstockAmount(BigDecimal realOutstockAmount) {
+        this.realOutstockAmount = realOutstockAmount;
+    }
+
+    public BigDecimal getTotalUsedAmount() {
+        return totalUsedAmount;
+    }
+
+    public void setTotalUsedAmount(BigDecimal totalUsedAmount) {
+        this.totalUsedAmount = totalUsedAmount;
+    }
+
+    public BigDecimal getOriUsedAmount() {
+        return oriUsedAmount;
+    }
+
+    public void setOriUsedAmount(BigDecimal oriUsedAmount) {
+        this.oriUsedAmount = oriUsedAmount;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("saleOrderMaterialId", getSaleOrderMaterialId())
+            .append("saleorderCode", getSaleorderCode())
+            .append("materialId", getMaterialId())
+            .append("materialCode", getMaterialCode())
+            .append("materialName", getMaterialName())
+            .append("materialSpec", getMaterialSpec())
+            .append("outstockAmount", getOutstockAmount())
+            .append("usedAmount", getUsedAmount())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesStockAlarmDetail.java

@@ -0,0 +1,170 @@
+package com.hw.mes.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.hw.common.core.annotation.Excel;
+import com.hw.common.core.web.domain.BaseEntity;
+
+/**
+ * 库存告警信息明细对象 mes_stock_alarm_detail
+ * 
+ * @author xins
+ * @date 2024-11-21
+ */
+public class MesStockAlarmDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键标识 */
+    private Long stockAlarmDetailId;
+
+    /** 报警信息ID */
+    @Excel(name = "报警信息ID")
+    private Long alarmInfoId;
+
+    /** 物料ID */
+    @Excel(name = "物料ID")
+    private Long materialId;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 物料规格 */
+    @Excel(name = "物料规格")
+    private String materialSpec;
+
+    /** 安全库存数量;仓库存放的总数量 */
+    @Excel(name = "安全库存数量;仓库存放的总数量")
+    private BigDecimal safeStockAmount;
+
+    /** 库存数量;手动冻结的，暂时可不用 */
+    @Excel(name = "库存数量;手动冻结的，暂时可不用")
+    private BigDecimal stockAmount;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createDate;
+
+    /** 最后更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updateDate;
+
+    public void setStockAlarmDetailId(Long stockAlarmDetailId) 
+    {
+        this.stockAlarmDetailId = stockAlarmDetailId;
+    }
+
+    public Long getStockAlarmDetailId() 
+    {
+        return stockAlarmDetailId;
+    }
+    public void setAlarmInfoId(Long alarmInfoId) 
+    {
+        this.alarmInfoId = alarmInfoId;
+    }
+
+    public Long getAlarmInfoId() 
+    {
+        return alarmInfoId;
+    }
+    public void setMaterialId(Long materialId) 
+    {
+        this.materialId = materialId;
+    }
+
+    public Long getMaterialId() 
+    {
+        return materialId;
+    }
+    public void setMaterialCode(String materialCode) 
+    {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialCode() 
+    {
+        return materialCode;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setMaterialSpec(String materialSpec) 
+    {
+        this.materialSpec = materialSpec;
+    }
+
+    public String getMaterialSpec() 
+    {
+        return materialSpec;
+    }
+    public void setSafeStockAmount(BigDecimal safeStockAmount) 
+    {
+        this.safeStockAmount = safeStockAmount;
+    }
+
+    public BigDecimal getSafeStockAmount() 
+    {
+        return safeStockAmount;
+    }
+    public void setStockAmount(BigDecimal stockAmount) 
+    {
+        this.stockAmount = stockAmount;
+    }
+
+    public BigDecimal getStockAmount() 
+    {
+        return stockAmount;
+    }
+    public void setCreateDate(Date createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public Date getCreateDate() 
+    {
+        return createDate;
+    }
+    public void setUpdateDate(Date updateDate) 
+    {
+        this.updateDate = updateDate;
+    }
+
+    public Date getUpdateDate() 
+    {
+        return updateDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockAlarmDetailId", getStockAlarmDetailId())
+            .append("alarmInfoId", getAlarmInfoId())
+            .append("materialId", getMaterialId())
+            .append("materialCode", getMaterialCode())
+            .append("materialName", getMaterialName())
+            .append("materialSpec", getMaterialSpec())
+            .append("safeStockAmount", getSafeStockAmount())
+            .append("stockAmount", getStockAmount())
+            .append("createBy", getCreateBy())
+            .append("createDate", getCreateDate())
+            .append("updateBy", getUpdateBy())
+            .append("updateDate", getUpdateDate())
+            .toString();
+    }
+}

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

@@ -0,0 +1,87 @@
+package com.hw.mes.mapper;
+
+import java.util.List;
+import com.hw.mes.domain.MesAlarmInfo;
+import com.hw.mes.domain.MesStockAlarmDetail;
+
+/**
+ * 生产告警信息Mapper接口
+ * 
+ * @author xins
+ * @date 2024-11-21
+ */
+public interface MesAlarmInfoMapper 
+{
+    /**
+     * 查询生产告警信息
+     * 
+     * @param alarmInfoId 生产告警信息主键
+     * @return 生产告警信息
+     */
+    public MesAlarmInfo selectMesAlarmInfoByAlarmInfoId(Long alarmInfoId);
+
+    /**
+     * 查询生产告警信息列表
+     * 
+     * @param mesAlarmInfo 生产告警信息
+     * @return 生产告警信息集合
+     */
+    public List<MesAlarmInfo> selectMesAlarmInfoList(MesAlarmInfo mesAlarmInfo);
+
+    /**
+     * 新增生产告警信息
+     * 
+     * @param mesAlarmInfo 生产告警信息
+     * @return 结果
+     */
+    public int insertMesAlarmInfo(MesAlarmInfo mesAlarmInfo);
+
+    /**
+     * 修改生产告警信息
+     * 
+     * @param mesAlarmInfo 生产告警信息
+     * @return 结果
+     */
+    public int updateMesAlarmInfo(MesAlarmInfo mesAlarmInfo);
+
+    /**
+     * 删除生产告警信息
+     * 
+     * @param alarmInfoId 生产告警信息主键
+     * @return 结果
+     */
+    public int deleteMesAlarmInfoByAlarmInfoId(Long alarmInfoId);
+
+    /**
+     * 批量删除生产告警信息
+     * 
+     * @param alarmInfoIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMesAlarmInfoByAlarmInfoIds(Long[] alarmInfoIds);
+
+    /**
+     * 批量删除库存告警信息明细
+     * 
+     * @param alarmInfoIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMesStockAlarmDetailByAlarmInfoIds(Long[] alarmInfoIds);
+    
+    /**
+     * 批量新增库存告警信息明细
+     * 
+     * @param mesStockAlarmDetailList 库存告警信息明细列表
+     * @return 结果
+     */
+    public int batchMesStockAlarmDetail(List<MesStockAlarmDetail> mesStockAlarmDetailList);
+    
+
+    /**
+     * 通过生产告警信息主键删除库存告警信息明细信息
+     * 
+     * @param alarmInfoId 生产告警信息ID
+     * @return 结果
+     */
+    public int deleteMesStockAlarmDetailByAlarmInfoId(Long alarmInfoId);
+}

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

@@ -94,4 +94,15 @@ public interface MesBaseMaterialInfoMapper
      * @return 物料信息
      */
     public MesBaseMaterialInfo selectMesBaseMaterialInfoByErpId(Long erpId);
+
+
+    /**
+     * 查询物料信息及其库存信息
+     *
+     * @param mesBaseMaterialInfo 物料信息
+     * @return 物料信息集合
+     */
+    public List<MesBaseMaterialInfo> selectMaterialInfoStockInfos(MesBaseMaterialInfo mesBaseMaterialInfo);
+
+
 }

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

@@ -0,0 +1,82 @@
+package com.hw.mes.mapper;
+
+import java.util.List;
+import com.hw.mes.domain.MesSaleOrderMaterial;
+
+/**
+ * 销售订单使用物料情况Mapper接口
+ * 
+ * @author xins
+ * @date 2024-11-21
+ */
+public interface MesSaleOrderMaterialMapper 
+{
+    /**
+     * 查询销售订单使用物料情况
+     * 
+     * @param saleOrderMaterialId 销售订单使用物料情况主键
+     * @return 销售订单使用物料情况
+     */
+    public MesSaleOrderMaterial selectMesSaleOrderMaterialBySaleOrderMaterialId(Long saleOrderMaterialId);
+
+    /**
+     * 查询销售订单使用物料情况列表
+     * 
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 销售订单使用物料情况集合
+     */
+    public List<MesSaleOrderMaterial> selectMesSaleOrderMaterialList(MesSaleOrderMaterial mesSaleOrderMaterial);
+
+    /**
+     * 新增销售订单使用物料情况
+     * 
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 结果
+     */
+    public int insertMesSaleOrderMaterial(MesSaleOrderMaterial mesSaleOrderMaterial);
+
+    /**
+     * 修改销售订单使用物料情况
+     * 
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 结果
+     */
+    public int updateMesSaleOrderMaterial(MesSaleOrderMaterial mesSaleOrderMaterial);
+
+    /**
+     * 删除销售订单使用物料情况
+     * 
+     * @param saleOrderMaterialId 销售订单使用物料情况主键
+     * @return 结果
+     */
+    public int deleteMesSaleOrderMaterialBySaleOrderMaterialId(Long saleOrderMaterialId);
+
+    /**
+     * 批量删除销售订单使用物料情况
+     * 
+     * @param saleOrderMaterialIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMesSaleOrderMaterialBySaleOrderMaterialIds(Long[] saleOrderMaterialIds);
+
+
+    /**
+     * 批量新增销售订单使用物料情况
+     *
+     * @param mesSaleOrderMaterialList 销售订单使用物料情况列表
+     * @return 结果
+     */
+    public int batchMesSaleOrderMaterial(List<MesSaleOrderMaterial> mesSaleOrderMaterialList);
+
+
+    /**
+     * 查询销售订单易耗品使用物料情况列表
+     *
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 销售订单使用物料情况集合
+     */
+    public List<MesSaleOrderMaterial> selectSaleOrderMaterialUsedInfos(MesSaleOrderMaterial mesSaleOrderMaterial);
+
+
+
+}

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

@@ -0,0 +1,61 @@
+package com.hw.mes.service;
+
+import java.util.List;
+import com.hw.mes.domain.MesAlarmInfo;
+
+/**
+ * 生产告警信息Service接口
+ * 
+ * @author xins
+ * @date 2024-11-21
+ */
+public interface IMesAlarmInfoService 
+{
+    /**
+     * 查询生产告警信息
+     * 
+     * @param alarmInfoId 生产告警信息主键
+     * @return 生产告警信息
+     */
+    public MesAlarmInfo selectMesAlarmInfoByAlarmInfoId(Long alarmInfoId);
+
+    /**
+     * 查询生产告警信息列表
+     * 
+     * @param mesAlarmInfo 生产告警信息
+     * @return 生产告警信息集合
+     */
+    public List<MesAlarmInfo> selectMesAlarmInfoList(MesAlarmInfo mesAlarmInfo);
+
+    /**
+     * 新增生产告警信息
+     * 
+     * @param mesAlarmInfo 生产告警信息
+     * @return 结果
+     */
+    public int insertMesAlarmInfo(MesAlarmInfo mesAlarmInfo);
+
+    /**
+     * 修改生产告警信息
+     * 
+     * @param mesAlarmInfo 生产告警信息
+     * @return 结果
+     */
+    public int updateMesAlarmInfo(MesAlarmInfo mesAlarmInfo);
+
+    /**
+     * 批量删除生产告警信息
+     * 
+     * @param alarmInfoIds 需要删除的生产告警信息主键集合
+     * @return 结果
+     */
+    public int deleteMesAlarmInfoByAlarmInfoIds(Long[] alarmInfoIds);
+
+    /**
+     * 删除生产告警信息信息
+     * 
+     * @param alarmInfoId 生产告警信息主键
+     * @return 结果
+     */
+    public int deleteMesAlarmInfoByAlarmInfoId(Long alarmInfoId);
+}

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

@@ -0,0 +1,61 @@
+package com.hw.mes.service;
+
+import java.util.List;
+import com.hw.mes.domain.MesSaleOrderMaterial;
+
+/**
+ * 销售订单使用物料情况Service接口
+ * 
+ * @author xins
+ * @date 2024-11-21
+ */
+public interface IMesSaleOrderMaterialService 
+{
+    /**
+     * 查询销售订单使用物料情况
+     * 
+     * @param saleOrderMaterialId 销售订单使用物料情况主键
+     * @return 销售订单使用物料情况
+     */
+    public MesSaleOrderMaterial selectMesSaleOrderMaterialBySaleOrderMaterialId(Long saleOrderMaterialId);
+
+    /**
+     * 查询销售订单使用物料情况列表
+     * 
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 销售订单使用物料情况集合
+     */
+    public List<MesSaleOrderMaterial> selectMesSaleOrderMaterialList(MesSaleOrderMaterial mesSaleOrderMaterial);
+
+    /**
+     * 新增销售订单使用物料情况
+     * 
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 结果
+     */
+    public int insertMesSaleOrderMaterial(MesSaleOrderMaterial mesSaleOrderMaterial);
+
+    /**
+     * 修改销售订单使用物料情况
+     * 
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 结果
+     */
+    public int updateMesSaleOrderMaterial(MesSaleOrderMaterial mesSaleOrderMaterial);
+
+    /**
+     * 批量删除销售订单使用物料情况
+     * 
+     * @param saleOrderMaterialIds 需要删除的销售订单使用物料情况主键集合
+     * @return 结果
+     */
+    public int deleteMesSaleOrderMaterialBySaleOrderMaterialIds(Long[] saleOrderMaterialIds);
+
+    /**
+     * 删除销售订单使用物料情况信息
+     * 
+     * @param saleOrderMaterialId 销售订单使用物料情况主键
+     * @return 结果
+     */
+    public int deleteMesSaleOrderMaterialBySaleOrderMaterialId(Long saleOrderMaterialId);
+}

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

@@ -3,9 +3,12 @@ package com.hw.mes.service;
 import java.util.List;
 
 import com.hw.mes.api.domain.MesBaseBarcodeInfo;
+import com.hw.mes.api.domain.MesBaseMaterialInfo;
 import com.hw.mes.api.domain.MesSaleOrderRelate;
 import com.hw.mes.api.domain.vo.MesSaleOrderTransferVo;
 import com.hw.mes.domain.MesSaleOrder;
+import com.hw.mes.domain.MesSaleOrderMaterial;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 销售订单信息Service接口
@@ -98,4 +101,24 @@ public interface IMesSaleOrderService
      * @return
      */
     public List<MesSaleOrderRelate> selectMesSaleOrderRelateJoinProductList(MesSaleOrderRelate mesSaleOrderRelate);
+
+    /**
+     * 获取易耗品物料的出库数量和分摊使用数量情况
+     * @return
+     */
+    public List<MesSaleOrderMaterial> selectSaleOrderMaterialUsedInfos(MesSaleOrderMaterial mesSaleOrderMaterial);
+
+    /**
+     * 获取易耗品物料的分摊使用数量情况
+     *
+     * @return
+     */
+    public List<MesSaleOrderMaterial> selectMesSaleOrderMaterialList(MesSaleOrderMaterial mesSaleOrderMaterial);
+
+    /**
+     * 更新销售订单分摊使用物料信息
+     * @param mesSaleOrderMaterialList
+     * @return
+     */
+    public int updateMesSaleOrderMaterials(List<MesSaleOrderMaterial> mesSaleOrderMaterialList);
 }

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

@@ -0,0 +1,131 @@
+package com.hw.mes.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.hw.common.core.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.hw.mes.domain.MesStockAlarmDetail;
+import com.hw.mes.mapper.MesAlarmInfoMapper;
+import com.hw.mes.domain.MesAlarmInfo;
+import com.hw.mes.service.IMesAlarmInfoService;
+
+/**
+ * 生产告警信息Service业务层处理
+ * 
+ * @author xins
+ * @date 2024-11-21
+ */
+@Service
+public class MesAlarmInfoServiceImpl implements IMesAlarmInfoService 
+{
+    @Autowired
+    private MesAlarmInfoMapper mesAlarmInfoMapper;
+
+    /**
+     * 查询生产告警信息
+     * 
+     * @param alarmInfoId 生产告警信息主键
+     * @return 生产告警信息
+     */
+    @Override
+    public MesAlarmInfo selectMesAlarmInfoByAlarmInfoId(Long alarmInfoId)
+    {
+        return mesAlarmInfoMapper.selectMesAlarmInfoByAlarmInfoId(alarmInfoId);
+    }
+
+    /**
+     * 查询生产告警信息列表
+     * 
+     * @param mesAlarmInfo 生产告警信息
+     * @return 生产告警信息
+     */
+    @Override
+    public List<MesAlarmInfo> selectMesAlarmInfoList(MesAlarmInfo mesAlarmInfo)
+    {
+        return mesAlarmInfoMapper.selectMesAlarmInfoList(mesAlarmInfo);
+    }
+
+    /**
+     * 新增生产告警信息
+     * 
+     * @param mesAlarmInfo 生产告警信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertMesAlarmInfo(MesAlarmInfo mesAlarmInfo)
+    {
+        int rows = mesAlarmInfoMapper.insertMesAlarmInfo(mesAlarmInfo);
+        insertMesStockAlarmDetail(mesAlarmInfo);
+        return rows;
+    }
+
+    /**
+     * 修改生产告警信息
+     * 
+     * @param mesAlarmInfo 生产告警信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateMesAlarmInfo(MesAlarmInfo mesAlarmInfo)
+    {
+        mesAlarmInfoMapper.deleteMesStockAlarmDetailByAlarmInfoId(mesAlarmInfo.getAlarmInfoId());
+        insertMesStockAlarmDetail(mesAlarmInfo);
+        return mesAlarmInfoMapper.updateMesAlarmInfo(mesAlarmInfo);
+    }
+
+    /**
+     * 批量删除生产告警信息
+     * 
+     * @param alarmInfoIds 需要删除的生产告警信息主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteMesAlarmInfoByAlarmInfoIds(Long[] alarmInfoIds)
+    {
+        mesAlarmInfoMapper.deleteMesStockAlarmDetailByAlarmInfoIds(alarmInfoIds);
+        return mesAlarmInfoMapper.deleteMesAlarmInfoByAlarmInfoIds(alarmInfoIds);
+    }
+
+    /**
+     * 删除生产告警信息信息
+     * 
+     * @param alarmInfoId 生产告警信息主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteMesAlarmInfoByAlarmInfoId(Long alarmInfoId)
+    {
+        mesAlarmInfoMapper.deleteMesStockAlarmDetailByAlarmInfoId(alarmInfoId);
+        return mesAlarmInfoMapper.deleteMesAlarmInfoByAlarmInfoId(alarmInfoId);
+    }
+
+    /**
+     * 新增库存告警信息明细信息
+     * 
+     * @param mesAlarmInfo 生产告警信息对象
+     */
+    public void insertMesStockAlarmDetail(MesAlarmInfo mesAlarmInfo)
+    {
+        List<MesStockAlarmDetail> mesStockAlarmDetailList = mesAlarmInfo.getMesStockAlarmDetailList();
+        Long alarmInfoId = mesAlarmInfo.getAlarmInfoId();
+        if (StringUtils.isNotNull(mesStockAlarmDetailList))
+        {
+            List<MesStockAlarmDetail> list = new ArrayList<MesStockAlarmDetail>();
+            for (MesStockAlarmDetail mesStockAlarmDetail : mesStockAlarmDetailList)
+            {
+                mesStockAlarmDetail.setAlarmInfoId(alarmInfoId);
+                list.add(mesStockAlarmDetail);
+            }
+            if (list.size() > 0)
+            {
+                mesAlarmInfoMapper.batchMesStockAlarmDetail(list);
+            }
+        }
+    }
+}

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

@@ -3,11 +3,15 @@ package com.hw.mes.service.impl;
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.github.pagehelper.PageHelper;
 import com.hw.common.core.constant.MesConstants;
 import com.hw.common.core.exception.ServiceException;
 import com.hw.common.core.utils.DateUtils;
 import com.hw.common.core.utils.StringUtils;
+import com.hw.common.core.utils.sql.SqlUtil;
 import com.hw.common.core.utils.uuid.Seq;
+import com.hw.common.core.web.page.PageDomain;
+import com.hw.common.core.web.page.TableSupport;
 import com.hw.common.security.utils.SecurityUtils;
 import com.hw.mes.mapper.MesBaseBarcodeInfoMapper;
 import com.hw.mes.mapper.MesOrderBindMapper;
@@ -16,6 +20,7 @@ import org.springframework.stereotype.Service;
 import com.hw.mes.mapper.MesBaseMaterialInfoMapper;
 import com.hw.mes.api.domain.MesBaseMaterialInfo;
 import com.hw.mes.service.IMesBaseMaterialInfoService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 物料信息Service业务层处理
@@ -173,4 +178,38 @@ public class MesBaseMaterialInfoServiceImpl implements IMesBaseMaterialInfoServi
     public MesBaseMaterialInfo selectMesBaseMaterialInfoByErpId(Long erpId) {
         return mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByErpId(erpId);
     }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    public void stockAlarm(){
+
+        //return list
+        stockAlarm(1);
+    }
+
+    public void stockAlarm(Integer startRow){
+        MesBaseMaterialInfo queryMaterialInfo = new MesBaseMaterialInfo();
+        Integer pageSize = 100;
+        Integer pageNum = startRow/pageSize+1;
+        PageHelper.startPage(1, 100, "");
+        List<MesBaseMaterialInfo> mesBaseMaterialInfoList = mesBaseMaterialInfoMapper.selectMaterialInfoStockInfos(queryMaterialInfo);
+        for(MesBaseMaterialInfo mesBaseMaterialInfo:mesBaseMaterialInfoList){
+            BigDecimal safeStockAmount = mesBaseMaterialInfo.getSafeStockAmount();
+            if(safeStockAmount!=null){
+                BigDecimal stockAmount = mesBaseMaterialInfo.getStockAmount()==null?BigDecimal.ZERO:mesBaseMaterialInfo.getStockAmount();
+                //如果库存数量小于安全库存
+                if(stockAmount.compareTo(safeStockAmount)<1){
+
+                }
+            }
+        }
+
+        //如果返回的数组的数量等于分页数量，则继续获取下一页数据
+        if (mesBaseMaterialInfoList.size() == pageSize) {
+            //通过递归同步所有供应商，测试先不用
+            stockAlarm(startRow + mesBaseMaterialInfoList.size());
+        }
+
+
+    }
 }

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

@@ -0,0 +1,96 @@
+package com.hw.mes.service.impl;
+
+import java.util.List;
+import com.hw.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.hw.mes.mapper.MesSaleOrderMaterialMapper;
+import com.hw.mes.domain.MesSaleOrderMaterial;
+import com.hw.mes.service.IMesSaleOrderMaterialService;
+
+/**
+ * 销售订单使用物料情况Service业务层处理
+ * 
+ * @author xins
+ * @date 2024-11-21
+ */
+@Service
+public class MesSaleOrderMaterialServiceImpl implements IMesSaleOrderMaterialService 
+{
+    @Autowired
+    private MesSaleOrderMaterialMapper mesSaleOrderMaterialMapper;
+
+    /**
+     * 查询销售订单使用物料情况
+     * 
+     * @param saleOrderMaterialId 销售订单使用物料情况主键
+     * @return 销售订单使用物料情况
+     */
+    @Override
+    public MesSaleOrderMaterial selectMesSaleOrderMaterialBySaleOrderMaterialId(Long saleOrderMaterialId)
+    {
+        return mesSaleOrderMaterialMapper.selectMesSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
+    }
+
+    /**
+     * 查询销售订单使用物料情况列表
+     * 
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 销售订单使用物料情况
+     */
+    @Override
+    public List<MesSaleOrderMaterial> selectMesSaleOrderMaterialList(MesSaleOrderMaterial mesSaleOrderMaterial)
+    {
+        return mesSaleOrderMaterialMapper.selectMesSaleOrderMaterialList(mesSaleOrderMaterial);
+    }
+
+    /**
+     * 新增销售订单使用物料情况
+     * 
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 结果
+     */
+    @Override
+    public int insertMesSaleOrderMaterial(MesSaleOrderMaterial mesSaleOrderMaterial)
+    {
+        mesSaleOrderMaterial.setCreateTime(DateUtils.getNowDate());
+        return mesSaleOrderMaterialMapper.insertMesSaleOrderMaterial(mesSaleOrderMaterial);
+    }
+
+    /**
+     * 修改销售订单使用物料情况
+     * 
+     * @param mesSaleOrderMaterial 销售订单使用物料情况
+     * @return 结果
+     */
+    @Override
+    public int updateMesSaleOrderMaterial(MesSaleOrderMaterial mesSaleOrderMaterial)
+    {
+        mesSaleOrderMaterial.setUpdateTime(DateUtils.getNowDate());
+        return mesSaleOrderMaterialMapper.updateMesSaleOrderMaterial(mesSaleOrderMaterial);
+    }
+
+    /**
+     * 批量删除销售订单使用物料情况
+     * 
+     * @param saleOrderMaterialIds 需要删除的销售订单使用物料情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMesSaleOrderMaterialBySaleOrderMaterialIds(Long[] saleOrderMaterialIds)
+    {
+        return mesSaleOrderMaterialMapper.deleteMesSaleOrderMaterialBySaleOrderMaterialIds(saleOrderMaterialIds);
+    }
+
+    /**
+     * 删除销售订单使用物料情况信息
+     * 
+     * @param saleOrderMaterialId 销售订单使用物料情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMesSaleOrderMaterialBySaleOrderMaterialId(Long saleOrderMaterialId)
+    {
+        return mesSaleOrderMaterialMapper.deleteMesSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
+    }
+}

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

@@ -5,20 +5,20 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.hw.common.core.exception.ServiceException;
 import com.hw.common.core.utils.DateUtils;
 import com.hw.common.core.utils.StringUtils;
 import com.hw.common.security.utils.SecurityUtils;
 import com.hw.mes.api.domain.MesBaseBarcodeInfo;
+import com.hw.mes.api.domain.MesBaseMaterialInfo;
 import com.hw.mes.api.domain.MesSaleOrderRelate;
 import com.hw.mes.api.domain.vo.MesBaseBarcodeInfoTransferVo;
 import com.hw.mes.api.domain.vo.MesSaleOrderTransferVo;
 import com.hw.mes.domain.MesMaterialBom;
-import com.hw.mes.mapper.MesBaseBarcodeInfoMapper;
+import com.hw.mes.domain.MesSaleOrderMaterial;
-import com.hw.mes.mapper.MesMaterialBomMapper;
+import com.hw.mes.mapper.*;
-import com.hw.mes.mapper.MesSaleOrderRelateMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.hw.mes.mapper.MesSaleOrderMapper;
 import com.hw.mes.domain.MesSaleOrder;
 import com.hw.mes.service.IMesSaleOrderService;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +43,12 @@ public class MesSaleOrderServiceImpl implements IMesSaleOrderService {
     @Autowired
     private MesMaterialBomMapper mesMaterialBomMapper;
 
+    @Autowired
+    private MesBaseMaterialInfoMapper mesBaseMaterialInfoMapper;
+
+    @Autowired
+    private MesSaleOrderMaterialMapper mesSaleOrderMaterialMapper;
+
     /**
      * 查询销售订单信息
      *
@@ -234,6 +240,7 @@ public class MesSaleOrderServiceImpl implements IMesSaleOrderService {
 
     /**
      * 获取销售订单关联信息表，join product
+     *
      * @param mesSaleOrderRelate
      * @return
      */
@@ -242,4 +249,76 @@ public class MesSaleOrderServiceImpl implements IMesSaleOrderService {
         return mesSaleOrderRelateMapper.selectMesSaleOrderRelateJoinProductList(mesSaleOrderRelate);
     }
 
+
+    /**
+     * 获取易耗品物料的出库数量和分摊使用数量情况
+     *
+     * @return
+     */
+    @Override
+    public List<MesSaleOrderMaterial> selectSaleOrderMaterialUsedInfos(MesSaleOrderMaterial mesSaleOrderMaterial) {
+        List<MesSaleOrderMaterial> mesSaleOrderMaterialList = mesSaleOrderMaterialMapper.selectSaleOrderMaterialUsedInfos(mesSaleOrderMaterial);
+        return mesSaleOrderMaterialList;
+        //wms_raw_outstock增加了used_amount
+        //select sum(outstock_amount),sum(used_amount) from wms_raw_outstock wro where material_id=material_id outstock_amount >0 and outstock_amount>used_amount
+    }
+
+    /**
+     * 获取易耗品物料的分摊使用数量情况
+     *
+     * @return
+     */
+    @Override
+    public List<MesSaleOrderMaterial> selectMesSaleOrderMaterialList(MesSaleOrderMaterial mesSaleOrderMaterial) {
+        List<MesSaleOrderMaterial> mesSaleOrderMaterialList = mesSaleOrderMaterialMapper.selectMesSaleOrderMaterialList(mesSaleOrderMaterial);
+        return mesSaleOrderMaterialList;
+        //wms_raw_outstock增加了used_amount
+        //select sum(outstock_amount),sum(used_amount) from wms_raw_outstock wro where material_id=material_id outstock_amount >0 and outstock_amount>used_amount
+    }
+
+    /**
+     * 更新销售订单分摊使用物料信息
+     *
+     * @param mesSaleOrderMaterialList
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int updateMesSaleOrderMaterials(List<MesSaleOrderMaterial> mesSaleOrderMaterialList) {
+        List<MesSaleOrderMaterial> toInsertedMesSaleOrderMaterialList = new ArrayList<>();
+//        List<MesSaleOrderMaterial> toUpdatedMesSaleOrderMateriaList = new ArrayList<>();
+        for (MesSaleOrderMaterial mesSaleOrderMaterial : mesSaleOrderMaterialList) {
+            if (mesSaleOrderMaterial.getUsedAmount() != null && mesSaleOrderMaterial.getUsedAmount().compareTo(BigDecimal.ZERO) > 0) {
+                BigDecimal realOutstockAmount = mesSaleOrderMaterial.getRealOutstockAmount();
+                BigDecimal totalUsedAmount = mesSaleOrderMaterial.getTotalUsedAmount()==null?BigDecimal.ZERO:mesSaleOrderMaterial.getTotalUsedAmount();//其他订单已分摊数量
+                BigDecimal oriUsedAmount = mesSaleOrderMaterial.getOriUsedAmount()==null?BigDecimal.ZERO:mesSaleOrderMaterial.getOriUsedAmount();
+                BigDecimal usedAmount = mesSaleOrderMaterial.getUsedAmount()==null?BigDecimal.ZERO:mesSaleOrderMaterial.getUsedAmount();
+                BigDecimal updateAmount = usedAmount.subtract(oriUsedAmount);//修改的数量差
+                if (updateAmount.compareTo(BigDecimal.ZERO) != 0) {
+                    BigDecimal newTotalUsedAmount = totalUsedAmount.add(usedAmount);
+                    if (realOutstockAmount.compareTo(newTotalUsedAmount) < 0) {
+                        throw new ServiceException("分摊数量总和不能大于出库数量");
+                    }
+                }
+
+
+                if (mesSaleOrderMaterial.getSaleOrderMaterialId() != null) {
+//                    toUpdatedMesSaleOrderMateriaList.add(mesSaleOrderMaterial);
+
+                    mesSaleOrderMaterialMapper.updateMesSaleOrderMaterial(mesSaleOrderMaterial);
+
+                } else {
+                    toInsertedMesSaleOrderMaterialList.add(mesSaleOrderMaterial);
+                }
+            }
+        }
+
+        if (toInsertedMesSaleOrderMaterialList != null && !toInsertedMesSaleOrderMaterialList.isEmpty()) {
+            mesSaleOrderMaterialMapper.batchMesSaleOrderMaterial(toInsertedMesSaleOrderMaterialList);
+
+        }
+
+        return 1;
+    }
+
 }

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

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hw.mes.mapper.MesAlarmInfoMapper">
+    
+    <resultMap type="MesAlarmInfo" id="MesAlarmInfoResult">
+        <result property="alarmInfoId"    column="alarm_info_id"    />
+        <result property="alarmInfoType"    column="alarm_info_type"    />
+        <result property="handleStatus"    column="handle_status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateDate"    column="update_date"    />
+    </resultMap>
+
+    <resultMap id="MesAlarmInfoMesStockAlarmDetailResult" type="MesAlarmInfo" extends="MesAlarmInfoResult">
+        <collection property="mesStockAlarmDetailList" notNullColumn="sub_stock_alarm_detail_id" javaType="java.util.List" resultMap="MesStockAlarmDetailResult" />
+    </resultMap>
+
+    <resultMap type="MesStockAlarmDetail" id="MesStockAlarmDetailResult">
+        <result property="stockAlarmDetailId"    column="sub_stock_alarm_detail_id"    />
+        <result property="alarmInfoId"    column="sub_alarm_info_id"    />
+        <result property="materialId"    column="sub_material_id"    />
+        <result property="materialCode"    column="sub_material_code"    />
+        <result property="materialName"    column="sub_material_name"    />
+        <result property="materialSpec"    column="sub_material_spec"    />
+        <result property="safeStockAmount"    column="sub_safe_stock_amount"    />
+        <result property="stockAmount"    column="sub_stock_amount"    />
+        <result property="createBy"    column="sub_create_by"    />
+        <result property="createDate"    column="sub_create_date"    />
+        <result property="updateBy"    column="sub_update_by"    />
+        <result property="updateDate"    column="sub_update_date"    />
+    </resultMap>
+
+    <sql id="selectMesAlarmInfoVo">
+        select alarm_info_id, alarm_info_type, handle_status, create_by, create_date, update_by, update_date from mes_alarm_info
+    </sql>
+
+    <select id="selectMesAlarmInfoList" parameterType="MesAlarmInfo" resultMap="MesAlarmInfoResult">
+        <include refid="selectMesAlarmInfoVo"/>
+        <where>  
+            <if test="alarmInfoType != null  and alarmInfoType != ''"> and alarm_info_type = #{alarmInfoType}</if>
+            <if test="handleStatus != null  and handleStatus != ''"> and handle_status = #{handleStatus}</if>
+            <if test="createDate != null "> and create_date = #{createDate}</if>
+            <if test="updateDate != null "> and update_date = #{updateDate}</if>
+        </where>
+    </select>
+    
+    <select id="selectMesAlarmInfoByAlarmInfoId" parameterType="Long" resultMap="MesAlarmInfoMesStockAlarmDetailResult">
+        select a.alarm_info_id, a.alarm_info_type, a.handle_status, a.create_by, a.create_date, a.update_by, a.update_date,
+ b.stock_alarm_detail_id as sub_stock_alarm_detail_id, b.alarm_info_id as sub_alarm_info_id, b.material_id as sub_material_id, b.material_code as sub_material_code, b.material_name as sub_material_name, b.material_spec as sub_material_spec, b.safe_stock_amount as sub_safe_stock_amount, b.stock_amount as sub_stock_amount, b.create_by as sub_create_by, b.create_date as sub_create_date, b.update_by as sub_update_by, b.update_date as sub_update_date
+        from mes_alarm_info a
+        left join mes_stock_alarm_detail b on b.alarm_info_id = a.alarm_info_id
+        where a.alarm_info_id = #{alarmInfoId}
+    </select>
+        
+    <insert id="insertMesAlarmInfo" parameterType="MesAlarmInfo" useGeneratedKeys="true" keyProperty="alarmInfoId">
+        insert into mes_alarm_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="alarmInfoType != null and alarmInfoType != ''">alarm_info_type,</if>
+            <if test="handleStatus != null and handleStatus != ''">handle_status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createDate != null">create_date,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateDate != null">update_date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="alarmInfoType != null and alarmInfoType != ''">#{alarmInfoType},</if>
+            <if test="handleStatus != null and handleStatus != ''">#{handleStatus},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createDate != null">#{createDate},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateDate != null">#{updateDate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateMesAlarmInfo" parameterType="MesAlarmInfo">
+        update mes_alarm_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="alarmInfoType != null and alarmInfoType != ''">alarm_info_type = #{alarmInfoType},</if>
+            <if test="handleStatus != null and handleStatus != ''">handle_status = #{handleStatus},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createDate != null">create_date = #{createDate},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateDate != null">update_date = #{updateDate},</if>
+        </trim>
+        where alarm_info_id = #{alarmInfoId}
+    </update>
+
+    <delete id="deleteMesAlarmInfoByAlarmInfoId" parameterType="Long">
+        delete from mes_alarm_info where alarm_info_id = #{alarmInfoId}
+    </delete>
+
+    <delete id="deleteMesAlarmInfoByAlarmInfoIds" parameterType="String">
+        delete from mes_alarm_info where alarm_info_id in 
+        <foreach item="alarmInfoId" collection="array" open="(" separator="," close=")">
+            #{alarmInfoId}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteMesStockAlarmDetailByAlarmInfoIds" parameterType="String">
+        delete from mes_stock_alarm_detail where alarm_info_id in 
+        <foreach item="alarmInfoId" collection="array" open="(" separator="," close=")">
+            #{alarmInfoId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteMesStockAlarmDetailByAlarmInfoId" parameterType="Long">
+        delete from mes_stock_alarm_detail where alarm_info_id = #{alarmInfoId}
+    </delete>
+
+    <insert id="batchMesStockAlarmDetail">
+        insert into mes_stock_alarm_detail( stock_alarm_detail_id, alarm_info_id, material_id, material_code, material_name, material_spec, safe_stock_amount, stock_amount, create_by, create_date, update_by, update_date) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.stockAlarmDetailId}, #{item.alarmInfoId}, #{item.materialId}, #{item.materialCode}, #{item.materialName}, #{item.materialSpec}, #{item.safeStockAmount}, #{item.stockAmount}, #{item.createBy}, #{item.createDate}, #{item.updateBy}, #{item.updateDate})
+        </foreach>
+    </insert>
+</mapper>

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

@@ -44,6 +44,11 @@
         <result property="lowValueConsumableFlag" column="low_value_consumable_flag"/>
         <result property="warehouseId" column="warehouse_id"/>
         <result property="purchasePriceUnitId" column="purchase_price_unit_id"/>
+        <result property="stockAmount" column="stock_amount"/>
+        <result property="realOutstockAmount" column="real_outstock_amount"/>
+        <result property="totalUsedAmount" column="total_used_amount"/>
+        <result property="ussedAmount" column="used_amount"/>
+        <result property="saleOrderMaterialId" column="sale_order_material_id"/>
     </resultMap>
 
     <sql id="selectMesBaseMaterialInfoVo">
@@ -371,4 +376,28 @@
         <include refid="selectMesBaseMaterialInfoVo"/>
         where bmi.material_code = #{materialCode} limit 1
     </select>
+
+
+
+
+
+
+
+    <select id="selectMaterialInfoStockInfos" parameterType="MesBaseMaterialInfo"
+            resultMap="MesBaseMaterialInfoResult">
+        select mbmi.material_id,
+        mbmi.material_code,
+        mbmi.material_name,
+        mbmi.material_spec,
+        mbmi.safe_stock_amount,
+        (select sum(total_amount) from wms_stock_total wst where wst.material_id=mbmi.material_id) as stock_amount
+        from mes_base_material_info mbmi
+        <where>
+            <if test="erpId != null ">and erp_id = #{erpId}</if>
+        </where>
+    </select>
+
+
+
+
 </mapper>

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

@@ -272,7 +272,7 @@
             <if test="selectFlag != null  and selectFlag != ''">and not exists (select 1 from mes_sale_order_relate msor where mso.sale_order_id = msor.relate_sale_order_id)</if>
             <if test="parentIds != null and parentIds != ''">and exists (select 1 from mes_material_bom mmb where mmb.erp_material_id=mso.material_id and mmb.material_bom_id in (${parentIds}))</if>
         </where>
-        order by mso.erp_modify_date desc
+        order by mso.saleorder_code,mso.erp_modify_date desc
     </select>
 
 

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

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hw.mes.mapper.MesSaleOrderMaterialMapper">
+    
+    <resultMap type="MesSaleOrderMaterial" id="MesSaleOrderMaterialResult">
+        <result property="saleOrderMaterialId"    column="sale_order_material_id"    />
+        <result property="saleorderCode"    column="saleorder_code"    />
+        <result property="materialId"    column="material_id"    />
+        <result property="materialCode"    column="material_code"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="materialSpec"    column="material_spec"    />
+        <result property="realOutstockAmount"    column="real_outstock_amount"    />
+        <result property="usedAmount"    column="used_amount"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+
+
+        <result property="totalUsedAmount"    column="total_used_amount"    />
+    </resultMap>
+
+
+
+    <sql id="selectMesSaleOrderMaterialVo">
+        select sale_order_material_id, saleorder_code, material_id, material_code, material_name, material_spec, real_outstock_amount, used_amount, create_by, create_time, update_by, update_time from mes_sale_order_material
+    </sql>
+
+    <select id="selectMesSaleOrderMaterialList" parameterType="MesSaleOrderMaterial" resultMap="MesSaleOrderMaterialResult">
+        <include refid="selectMesSaleOrderMaterialVo"/>
+        <where>  
+            <if test="saleorderCode != null  and saleorderCode != ''"> and saleorder_code = #{saleorderCode}</if>
+            <if test="materialId != null "> and material_id = #{materialId}</if>
+            <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="materialSpec != null  and materialSpec != ''"> and material_spec = #{materialSpec}</if>
+            <if test="usedAmount != null "> and used_amount = #{usedAmount}</if>
+        </where>
+        order by saleorder_code
+    </select>
+    
+    <select id="selectMesSaleOrderMaterialBySaleOrderMaterialId" parameterType="Long" resultMap="MesSaleOrderMaterialResult">
+        <include refid="selectMesSaleOrderMaterialVo"/>
+        where sale_order_material_id = #{saleOrderMaterialId}
+    </select>
+        
+    <insert id="insertMesSaleOrderMaterial" parameterType="MesSaleOrderMaterial" useGeneratedKeys="true" keyProperty="saleOrderMaterialId">
+        insert into mes_sale_order_material
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="saleorderCode != null and saleorderCode != ''">saleorder_code,</if>
+            <if test="materialId != null">material_id,</if>
+            <if test="materialCode != null and materialCode != ''">material_code,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="materialSpec != null">material_spec,</if>
+            <if test="realOutstockAmount != null">real_outstock_amount,</if>
+            <if test="usedAmount != null">used_amount,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="saleorderCode != null and saleorderCode != ''">#{saleorderCode},</if>
+            <if test="materialId != null">#{materialId},</if>
+            <if test="materialCode != null and materialCode != ''">#{materialCode},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="materialSpec != null">#{materialSpec},</if>
+            <if test="outstockAmount != null">#{outstockAmount},</if>
+            <if test="usedAmount != null">#{usedAmount},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateMesSaleOrderMaterial" parameterType="MesSaleOrderMaterial">
+        update mes_sale_order_material
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="saleorderCode != null and saleorderCode != ''">saleorder_code = #{saleorderCode},</if>
+            <if test="materialId != null">material_id = #{materialId},</if>
+            <if test="materialCode != null and materialCode != ''">material_code = #{materialCode},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="materialSpec != null">material_spec = #{materialSpec},</if>
+            <if test="realOutstockAmount != null">real_outstock_amount = #{realOutstockAmount},</if>
+            <if test="usedAmount != null">used_amount = #{usedAmount},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where sale_order_material_id = #{saleOrderMaterialId}
+    </update>
+
+    <delete id="deleteMesSaleOrderMaterialBySaleOrderMaterialId" parameterType="Long">
+        delete from mes_sale_order_material where sale_order_material_id = #{saleOrderMaterialId}
+    </delete>
+
+    <delete id="deleteMesSaleOrderMaterialBySaleOrderMaterialIds" parameterType="String">
+        delete from mes_sale_order_material where sale_order_material_id in 
+        <foreach item="saleOrderMaterialId" collection="array" open="(" separator="," close=")">
+            #{saleOrderMaterialId}
+        </foreach>
+    </delete>
+
+
+
+
+    <insert id="batchMesSaleOrderMaterial">
+        insert into mes_sale_order_material( sale_order_material_id, saleorder_code, material_id, material_code, material_name, material_spec, real_outstock_amount, used_amount, create_by, create_time, update_by, update_time) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.saleOrderMaterialId}, #{item.saleorderCode}, #{item.materialId}, #{item.materialCode}, #{item.materialName}, #{item.materialSpec}, #{item.outstockAmount}, #{item.usedAmount}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <select id="selectSaleOrderMaterialUsedInfos" parameterType="MesSaleOrderMaterial"
+            resultMap="MesSaleOrderMaterialResult">
+        select mbmi.material_id,
+        mbmi.material_code,
+        mbmi.material_name,
+        mbmi.material_spec,
+        msom.used_amount,
+        msom.sale_order_material_id,
+        msom.saleorder_code,
+        (select sum(ifnull(real_outstock_amount,0)) from wms_raw_outstock wro where wro.material_id=mbmi.material_id and wro.real_outstock_amount >0) as real_outstock_amount,
+        (select sum(ifnull(used_amount,0)) from mes_sale_order_material msom where msom.material_id=mbmi.material_id) as total_used_amount
+
+        from mes_base_material_info mbmi left join mes_sale_order_material msom on mbmi.material_id=msom.material_id and msom.saleorder_code =  #{saleorderCode}
+        <where>
+            and mbmi.low_value_consumable_flag = '1'
+        </where>
+    </select>
+
+</mapper>

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

@@ -247,7 +247,6 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService {
                 throw new ServiceException("请输入审核意见");
             }
             wmsRawOutstocks.forEach(wmsRawOutstock -> {
-                //todo:批次码
                 Long stockTotalId = wmsRawOutstock.getStockTotalId();
                 BigDecimal planAmount = wmsRawOutstock.getOutstockAmount();
                 WmsStockTotal wmsStockTotal = wmsStockTotalMapper.selectWmsStockTotalByStockTotalId(stockTotalId);

hw-ui/src/api/mes/saleOrder.js

@@ -63,3 +63,32 @@ export function selectSaleOrderRelates(query) {
     params: query
   })
 }
+
+
+// 查询销售订单分摊使用易耗品物料信息列表
+export function selectMaterialOutstockUsedInfos(query) {
+  return request({
+    url: '/mes/saleOrder/selectMaterialOutstockUsedInfos',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 更新销售订单分摊使用物料信息
+export function updateMesSaleOrderMaterials(data) {
+  return request({
+    url: '/mes/saleOrder/updateMesSaleOrderMaterials',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出销售订单分摊使用物料信息
+export function exportSaleOrderMaterials(data) {
+  return request({
+    url: '/mes/saleOrder/exportSaleOrderMaterials',
+    method: 'post',
+    data: data
+  })
+}

hw-ui/src/api/mes/saleOrderMaterial.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询销售订单使用物料情况列表
+export function listSaleOrderMaterial(query) {
+  return request({
+    url: '/mes/saleOrderMaterial/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询销售订单使用物料情况详细
+export function getSaleOrderMaterial(saleOrderMaterialId) {
+  return request({
+    url: '/mes/saleOrderMaterial/' + saleOrderMaterialId,
+    method: 'get'
+  })
+}
+
+// 新增销售订单使用物料情况
+export function addSaleOrderMaterial(data) {
+  return request({
+    url: '/mes/saleOrderMaterial',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改销售订单使用物料情况
+export function updateSaleOrderMaterial(data) {
+  return request({
+    url: '/mes/saleOrderMaterial',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除销售订单使用物料情况
+export function delSaleOrderMaterial(saleOrderMaterialId) {
+  return request({
+    url: '/mes/saleOrderMaterial/' + saleOrderMaterialId,
+    method: 'delete'
+  })
+}

hw-ui/src/router/index.js

@@ -239,6 +239,23 @@ export const dynamicRoutes = [
       }
     ]
   },
+  {
+    path: '/mes/sale-order-material',
+    component: Layout,
+    hidden: true,
+    permissions: ['mes:saleOrder:used'],
+    children: [
+      {
+        path: 'index/:saleorderCode',
+        component: () => import('@/views/mes/saleOrderMaterial/index'),
+        name: 'MaterialUsed',
+        meta: { title: '物料使用', activeMenu: '/mes/saleOrderMaterial' }
+      }
+    ]
+  },
+
+
+
   {
     path: '/system/wfProcessActivityAuth',
     component: Layout,

hw-ui/src/views/mes/productOrder/index.vue

@@ -1084,8 +1084,8 @@ export default {
       let selectedRow = this.$refs.productOrderRef.selectedRow;
       this.form.preOrderId = selectedRow.productOrderId;
       this.form.preOrderCode = selectedRow.orderCode;
-      if (selectedRow.planBeginTime != null && this.form.planBeginTime == null) {
+      if (selectedRow.planEndTime != null && selectedRow.planEndTime !=='') {
-        const date = new Date(selectedRow.planBeginTime);
+        const date = new Date(selectedRow.planEndTime);
         date.setDate(date.getDate() + 1)
         this.form.planBeginTime = parseTime(date, '{y}-{m}-{d} {h}:{i}:{s}');
       }
@@ -1309,6 +1309,19 @@ export default {
             this.submitLoading = false;
             return this.$modal.msgError("计划数量不能大于销售数量！");
           }
+
+          if(this.form.planEndTime <= this.form.planBeginTime){
+            this.submitLoading = false;
+            return this.$modal.msgError("计划结束时间需大于计划开始时间！");
+          }
+
+          if(this.form.planDeliveryDate <= this.form.planEndTime){
+            this.submitLoading = false;
+            return this.$modal.msgError("计划交付时间需大于计划结束时间！");
+          }
+
+
+
           if (this.form.productOrderId != null) {
             updateProductOrder(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

hw-ui/src/views/mes/saleOrder/index.vue

@@ -118,6 +118,17 @@
       </el-col>
 
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar-->
+
+      <el-col :span="1.5">
+       <el-button
+         type="primary"
+         plain
+         icon="el-icon-download"
+         size="mini"
+         @click="handleExportSaleOrderMaterial"
+         v-hasPermi="['mes:saleOrder:used']"
+       >物料使用情况导出</el-button>
+     </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
@@ -221,6 +232,15 @@
            v-if="scope.row.saleOrderClassfication==='1'"
          >已绑定
          </el-button>
+         <el-button
+           size="mini"
+           type="text"
+           icon="el-icon-edit"
+           @click="handleMaterialUsed(scope.row)"
+           v-hasPermi="['mes:saleOrder:used']"
+           v-if="scope.row.saleOrderClassfication==='1'"
+         >物料使用</el-button>
+
        </template>
      </el-table-column>
    </el-table>
@@ -641,8 +661,22 @@ export default {
       }).then(() => {
         this.$modal.msgSuccess("执行成功");
       }).catch(() => {});
-    }
+    },
+
 
+    handleMaterialUsed(row){
+      let saleorderCode = row.saleorderCode;
+      const params = {queryParams: this.queryParams, t: Date.now(),saleorderCode:saleorderCode};
+      this.$tab.openPage("销售订单[" + saleorderCode + "]", '/mes/sale-order-material/index/' + saleorderCode, params);
+    },
+
+
+    /** 导出按钮操作 */
+    handleExportSaleOrderMaterial() {
+      this.download('mes/saleOrder/exportSaleOrderMaterials', {
+        ...this.queryParams
+      }, `物料情况使用_${new Date().getTime()}.xlsx`)
+    }
 
   }
 };

hw-ui/src/views/mes/saleOrderMaterial/index.vue

@@ -0,0 +1,356 @@
+<template>
+  <div class="app-container">
+    <!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
+    <!--      <el-form-item label="销售订单编号" prop="saleorderCode">-->
+    <!--        <el-input-->
+    <!--          v-model="queryParams.saleorderCode"-->
+    <!--          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="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="outstockAmount">-->
+    <!--        <el-input-->
+    <!--          v-model="queryParams.outstockAmount"-->
+    <!--          placeholder="请输入出库数量"-->
+    <!--          clearable-->
+    <!--          @keyup.enter.native="handleQuery"-->
+    <!--        />-->
+    <!--      </el-form-item>-->
+    <!--      <el-form-item label="分摊使用的数量" prop="usedAmount">-->
+    <!--        <el-input-->
+    <!--          v-model="queryParams.usedAmount"-->
+    <!--          placeholder="请输入分摊使用的数量"-->
+    <!--          clearable-->
+    <!--          @keyup.enter.native="handleQuery"-->
+    <!--        />-->
+    <!--      </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="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['mes:saleOrderMaterial:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['mes:saleOrderMaterial:edit']"-->
+      <!--        >修改</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['mes:saleOrderMaterial:remove']"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          :loading="submitLoading"
+          @click="submitForm"
+          v-hasPermi="['mes:saleOrder:used']"
+        >保存
+        </el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['mes:saleOrder:used']"
+        >导出
+        </el-button>
+      </el-col>
+
+    </el-row>
+
+    <el-table v-loading="loading" :data="saleOrderMaterialList" @selection-change="handleSelectionChange">
+      <!--      <el-table-column type="selection" width="55" align="center" />-->
+      <!--      <el-table-column label="主键标识" align="center" prop="saleOrderMaterialId" />-->
+      <!--      <el-table-column label="销售订单编号" align="center" prop="saleorderCode" />-->
+      <!--      <el-table-column label="物料ID" align="center" prop="materialId" />-->
+      <el-table-column label="序号" align="center" type="index"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode"/>
+      <el-table-column label="物料名称" align="center" prop="materialName"/>
+      <el-table-column label="物料规格" align="center" prop="materialSpec"/>
+      <el-table-column label="出库数量" align="center" prop="realOutstockAmount"/>
+      <el-table-column label="其他订单分摊数量" align="center" prop="totalUsedAmount"/>
+      <el-table-column label="此订单分摊数量" align="center" prop="usedAmount">
+        <template slot-scope="scope">
+          <el-input-number v-model="scope.row.usedAmount" placeholder="请输入使用数量">
+          </el-input-number>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-edit"-->
+      <!--            @click="handleUpdate(scope.row)"-->
+      <!--            v-hasPermi="['mes:saleOrderMaterial:edit']"-->
+      <!--          >修改</el-button>-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-delete"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--            v-hasPermi="['mes:saleOrderMaterial:remove']"-->
+      <!--          >删除</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="销售订单编号" prop="saleorderCode">
+          <el-input v-model="form.saleorderCode" 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="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码"/>
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称"/>
+        </el-form-item>
+        <el-form-item label="物料规格" prop="materialSpec">
+          <el-input v-model="form.materialSpec" type="textarea" 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="usedAmount">
+          <el-input v-model="form.usedAmount" 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>
+  </div>
+</template>
+
+<script>
+import {selectMaterialOutstockUsedInfos,updateMesSaleOrderMaterials} from "@/api/mes/saleOrder";
+
+export default {
+  name: "SaleOrderMaterial",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 销售订单使用物料情况表格数据
+      saleOrderMaterialList: [],
+      submitLoading:false,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        saleorderCode: null,
+        materialId: null,
+        materialCode: null,
+        materialName: null,
+        materialSpec: null,
+        outstockAmount: null,
+        usedAmount: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        saleorderCode: [
+          {required: true, message: "销售订单编号不能为空", trigger: "blur"}
+        ],
+        materialId: [
+          {required: true, message: "物料ID不能为空", trigger: "blur"}
+        ],
+        materialCode: [
+          {required: true, message: "物料编码不能为空", trigger: "blur"}
+        ],
+        updateBy: [
+          {required: true, message: "更新人不能为空", trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询销售订单使用物料情况列表 */
+    getList() {
+      this.loading = true;
+      let saleorderCode = this.$route.query && this.$route.query.saleorderCode;
+      this.queryParams.saleorderCode = saleorderCode;
+      selectMaterialOutstockUsedInfos(this.queryParams).then(response => {
+        response.rows.forEach(e => {
+          e.oriUsedAmount = e.usedAmount
+          e.totalUsedAmount = e.totalUsedAmount == null ? 0:e.totalUsedAmount;
+          e.usedAmount = e.usedAmount == null ? 0:e.usedAmount;
+          e.totalUsedAmount = e.totalUsedAmount - e.usedAmount;//其他销售订单分摊的，不包括当前销售订单
+          e.saleorderCode = saleorderCode
+
+        });
+
+        this.saleOrderMaterialList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        saleOrderMaterialId: null,
+        saleorderCode: null,
+        materialId: null,
+        materialCode: null,
+        materialName: null,
+        materialSpec: null,
+        outstockAmount: null,
+        usedAmount: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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.saleOrderMaterialId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.submitLoading = true;
+      let errorMsg="";
+      this.saleOrderMaterialList.forEach((e,index) => {
+          if(e.usedAmount && e.usedAmount!==null){
+            let realOutstockAmount = e.realOutstockAmount == null ? 0 :e.realOutstockAmount;
+            let totalUsedAmount = e.totalUsedAmount == null ? 0 :e.totalUsedAmount;
+            let usedAmount = e.usedAmount == null ? 0 :e.usedAmount;
+            let newTotalUsedAmount = totalUsedAmount+usedAmount;
+            if(realOutstockAmount < newTotalUsedAmount){
+               errorMsg+="第"+(parseInt(index)+1)+"行，总共分摊数量为"+newTotalUsedAmount+",大于出库数量"+realOutstockAmount+";\n";
+            }
+          }
+      });
+
+      if(errorMsg!==""){
+        this.$modal.msgWarning(errorMsg);
+        this.submitLoading=false;
+        return;
+      }
+
+      updateMesSaleOrderMaterials(this.saleOrderMaterialList).then(response => {
+        this.$modal.msgSuccess("保存成功");
+        this.submitLoading=false;
+        this.getList();
+      });
+
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      let saleorderCode = this.$route.query && this.$route.query.saleorderCode;
+      this.download('mes/saleOrder/exportSaleOrderMaterials', {
+        ...this.queryParams
+      }, `物料情况使用_`+saleorderCode+`_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>