HTML/views/BaseSetting/Materials.html

@@ -254,7 +254,7 @@

                table.render({
                    elem: '#LAY-app-content-list',
                    url: IP +"/Basis/GetMateList",
                    url: IP + "/Basis/GetMateList",
                    method: 'POST',
                    height: h1,//'full-'+hei1
                    id: 'LAY-app-content-list',
@@ -341,7 +341,7 @@
                        }
                    ]]
                });
				

            }


@@ -445,6 +445,22 @@
                                        Price: Number(field.Price),
                                        AdventTime: Number(field.AdventTime), //临期
                                        LowInventory: Number(field.LowInventory), //低库存

                                        //CAS号
                                        CasNo: field.CasNo,
                                        //是否批次管理
                                        IsLotManage: field.IsLotManage,
                                        //留样时间
                                        LeaveTime: field.LeaveTime,
                                        //液体物料闪点
                                        LiquidFlashPoint: field.LiquidFlashPoint,
                                        //危险货位信息
                                        DangerLocatInfo: field.DangerLocatInfo,
                                        //灭火方式
                                        OutFireMethod: field.OutFireMethod,
                                        //物料禁忌
                                        MaterialTaboo: field.MaterialTaboo,

                                        Demo: field.Demo
                                    };
                                    if (doing) {
@@ -617,6 +633,22 @@
                                    Price: Number(field.Price),
                                    AdventTime: Number(field.AdventTime), //临期
                                    LowInventory: Number(field.LowInventory), //低库存

                                    //CAS号
                                    CasNo: field.CasNo,
                                    //是否批次管理
                                    IsLotManage: field.IsLotManage,
                                    //留样时间
                                    LeaveTime: field.LeaveTime,
                                    //液体物料闪点
                                    LiquidFlashPoint: field.LiquidFlashPoint,
                                    //危险货位信息
                                    DangerLocatInfo: field.DangerLocatInfo,
                                    //灭火方式
                                    OutFireMethod: field.OutFireMethod,
                                    //物料禁忌
                                    MaterialTaboo: field.MaterialTaboo,

                                    Demo: field.Demo
                                };
                                if (doing) {

 HTML/views/BaseSetting/MaterialsForm.html

@@ -10,10 +10,11 @@
        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <style>
        .EditColor{
        .EditColor {
            border-color: #ed7878;
        }
        .layui-form-label{

        .layui-form-label {
            width: 70px;
        }
    </style>
@@ -27,13 +28,13 @@
                <label class="layui-form-label">物料号 <strong style="color: red;font-size: 18px;">*</strong></label>
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" name="SkuNo" placeholder="请输入物料编号" lay-verify="required" autocomplete="off"
                        class="layui-input" >
                        class="layui-input">
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label">物料类别 <strong style="color: red;font-size: 18px;">*</strong></label>
                <div class="layui-input-block " style="width: 182px;">
                    <select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search >
                    <select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search>
                        <option value=""></option>
                    </select>
                </div>
@@ -102,6 +103,8 @@
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline" id="IsInspectshow">
                <label class="layui-form-label">是否受控</label>
                <div class="layui-input-block" style="width: 182px;">
@@ -124,7 +127,7 @@
            <!-- 单位 -->
            <div class="layui-inline">
                <label class="layui-form-label">单位</label>
                <div class="layui-input-block" style="width: 182px;"> 
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" name="UnitNo" id="UnitNo" placeholder="请输入单位" lay-verify="" autocomplete="off"
                        class="layui-input">
                </div>
@@ -170,9 +173,10 @@
            <div class="layui-inline">
                <label class="layui-form-label" style="width: 70px;">拆包效期(天)</label>
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="UnpackWarranty" placeholder="请输入拆包效期" lay-verify="" autocomplete="off" class="layui-input">
                    <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="UnpackWarranty"
                        placeholder="请输入拆包效期" lay-verify="" autocomplete="off" class="layui-input">
                </div>
            </div> 
            </div>
            <!-- <div class="layui-inline">
                <label class="layui-form-label">理论单价</label>
                <div class="layui-input-block" style="width: 182px;">
@@ -197,7 +201,71 @@
                </div>
            </div>
        </div>
		

        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">CAS号</label>
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" name="CasNo" id="CasNo" placeholder="请输入CAS号" lay-verify="" autocomplete="off"
                        class="layui-input">
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label">是否批次管理</label>
                <div class="layui-input-block" style="width: 182px;">
                    <select name="IsLotManage" id="IsLotManage" lay-verify="" lay-verify="" lay-search>
                        <!-- <option value=""></option> -->
                        <option value="0">否</option>
                        <option value="1">是</option>
                    </select>
                </div>
            </div>
        </div>

        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">留样时间</label>
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" name="LeaveTime" id="LeaveTime" placeholder="请输入留样时间" lay-verify=""
                        autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label">液体物料闪点</label>
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" name="LiquidFlashPoint" id="LiquidFlashPoint" placeholder="请输入液体物料闪点"
                        lay-verify="" autocomplete="off" class="layui-input">
                </div>
            </div>
        </div>

        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">危险货位信息</label>
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" name="DangerLocatInfo" id="DangerLocatInfo" placeholder="请输入危险货位信息" lay-verify=""
                        autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label">灭火方式</label>
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" name="OutFireMethod" id="OutFireMethod" placeholder="请输入灭火方式" lay-verify=""
                        autocomplete="off" class="layui-input">
                </div>
            </div>
        </div>

        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">物料禁忌</label>
                <div class="layui-input-block" style="width: 182px;">
                    <input type="text" name="MaterialTaboo" id="MaterialTaboo" placeholder="请输入物料禁忌" lay-verify=""
                        autocomplete="off" class="layui-input">
                </div>
            </div>
        </div>

        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">备注</label>
@@ -223,10 +291,17 @@
            base: '../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'layer'], function () {
        }).use(['index', 'form', 'layer', 'laydate'], function () {
            var $ = layui.$,
                form = layui.form,
                layer = layui.layer;
            laydate = layui.laydate;


            laydate.render({
                elem: '#LeaveTime',
                format: 'yyyy-MM-dd' //可任意组合
            });

            // var sel3 = false;
            // //获取类别信息 CategoryNo
@@ -298,31 +373,31 @@

            getPackagList();
            var sel2 = false;
            function getPackagList(){
                var packagList=[];
            function getPackagList() {
                var packagList = [];

                let shouldContinue = true;
                let index = 1;
                while (shouldContinue) {
                    synData(IP + "/Basis/GetPackagList?page="+index, {}, 'get', function (res, status, error) {
                    synData(IP + "/Basis/GetPackagList?page=" + index, {}, 'get', function (res, status, error) {
                        if (res.code == 0) {
                            if(res.data.length>0){
                            if (res.data.length > 0) {
                                packagList.push(res.data);
                                index++;						
                            }else{
                                shouldContinue=false;
                            }							
                        }else {
                            shouldContinue=false;
                                index++;
                            } else {
                                shouldContinue = false;
                            }
                        } else {
                            shouldContinue = false;
                        }
                    });
                }
                if(packagList.length>0){				
                if (packagList.length > 0) {
                    for (var i = 0; i < packagList.length; i++) {
                        var itemList=packagList[i];
                        for(var j = 0; j < itemList.length; j++){
                        var itemList = packagList[i];
                        for (var j = 0; j < itemList.length; j++) {
                            $("#PackagNo").append('<option value =' + itemList[j].PackagNo + '>' + itemList[j].PackagName + '</option>');
                        }						
                        }
                    }
                    form.render('select');
                    sel2 = true;
@@ -363,7 +438,7 @@
                                $("#IsControlled option[value='" + res.data.IsControlled + "']").attr("selected", "selected"); // 是否受控
                                $("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected", "selected"); // 是否免检
                                $("#IsPasteCode option[value='" + res.data.IsPasteCode + "']").attr("selected", "selected"); // 是否贴标
                                $("input[name='UnitNo']").val(res.data.UnitNo); 
                                $("input[name='UnitNo']").val(res.data.UnitNo);
                                $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 包装
                                // $("#PackagNo").attr("disabled", "disabled")
                                $("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 存储环境
@@ -373,6 +448,22 @@
                                $("input[name='Price']").val(res.data.Price); // 理论单价
                                $("input[name='AdventTime']").val(res.data.AdventTime); // 临期
                                $("input[name='LowInventory']").val(res.data.LowInventory); // 低库存

                                //CAS号
                                $("input[name='CasNo']").val(res.data.CasNo);
                                //是否批次管理
                                $("#IsLotManage option[value='" + res.data.IsLotManage + "']").attr("selected", "selected");
                                //留样时间
                                $("input[name='LeaveTime']").val(res.data.LeaveTime);
                                //液体物料闪点
                                $("input[name='LiquidFlashPoint']").val(res.data.LiquidFlashPoint);
                                //危险货位信息
                                $("input[name='DangerLocatInfo']").val(res.data.DangerLocatInfo);
                                //灭火方式
                                $("input[name='OutFireMethod']").val(res.data.OutFireMethod);
                                //物料禁忌
                                $("input[name='MaterialTaboo']").val(res.data.MaterialTaboo);

                                $("textarea[name='Demo']").val(res.data.Demo); //备注
                                form.render();
                                form.render('select');
@@ -410,7 +501,7 @@

            // });

			

        });

        //获取浏览器参数

 Wms/Model/ModelDto/SysDto/MaterialsDto.cs

@@ -158,5 +158,42 @@
        /// 更新人名称
        /// </summary>
        public string UpdateUserName { get; set; }


        /// <summary>
        /// CAS号
        /// </summary>
        public string CasNo { get; set; }

        /// <summary>
        /// 是否批次管理
        /// </summary>
        public string IsLotManage { get; set; }

        /// <summary>
        /// 留样时间
        /// </summary>
        public string LeaveTime { get; set; }

        /// <summary>
        /// 液体物料闪点
        /// </summary>
        public string LiquidFlashPoint { get; set; }

        /// <summary>
        /// 危险货位信息
        /// </summary>
        public string DangerLocatInfo { get; set; }

        /// <summary>
        /// 灭火方式
        /// </summary>
        public string OutFireMethod { get; set; }

        /// <summary>
        /// 物料禁忌
        /// </summary>
        public string MaterialTaboo { get; set; }

    }
}

 Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs

@@ -18,10 +18,10 @@

namespace WMS.BLL.BllSoServer
{
    public class ExportNoticeDetailServer: DbHelper<BllExportNoticeDetail>,IExportNoticeDetailServer
    public class ExportNoticeDetailServer : DbHelper<BllExportNoticeDetail>, IExportNoticeDetailServer
    {
        private static readonly SqlSugarScope Db = DataContext.Db;
        public ExportNoticeDetailServer():base(Db)
        public ExportNoticeDetailServer() : base(Db)
        {
        }
        public async Task<List<ExportNoticeDetailDto>> GetExportNoticeDetailList(GetExportNoticeDetailVm model, RefAsync<int> count)
@@ -37,7 +37,7 @@
            }

            var data = await GetAllWhereAsync(a => a.SONo == model.SoNo)
                .LeftJoin<SysPackag>((a, b) => a.PackagNo == b.PackagNo)
                .LeftJoin<SysPackag>((a, b) => b.IsDel == "0" && a.PackagNo == b.PackagNo)
                .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
                .LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
                .Select((a, b, c, d) => new ExportNoticeDetailDto()
@@ -78,7 +78,7 @@
        public bool DelExportNoticeDetail(int id, int userId)
        {
            try
            { 
            {
                //出库单明细
                var noticeDetail = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.Id == id).ToList().FirstOrDefault();
                //出库单明细                
@@ -86,7 +86,7 @@

                if (noticeDetail == null)
                {
                    throw  new Exception("未查询到出库单明细信息");
                    throw new Exception("未查询到出库单明细信息");
                }
                if (notice == null)
                {
@@ -134,7 +134,7 @@

                        n = Db.Updateable(notice).ExecuteCommand();
                        j = 1;
                    } 
                    }
                    var m = Db.Updateable(sd).UpdateColumns(it => new { it.LockQty }).ExecuteCommand();

                    var i = Db.Updateable(noticeDetail).ExecuteCommand();
@@ -142,7 +142,7 @@
                    //添加操作日志记录
                    var k = new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "删除", $"删除了单据号为{notice.SONo}、物料为{noticeDetail.SkuNo}、批次号为{noticeDetail.LotNo}的单据明细信息", userId);

                    if (j>0)
                    if (j > 0)
                    {
                        if (n > 0 && m > 0 && i > 0 && k)
                        {
@@ -152,13 +152,13 @@
                    }
                    else
                    {
                        if ( m > 0 && i > 0 && k)
                        if (m > 0 && i > 0 && k)
                        {
                            Db.CommitTran();
                            return true;
                        }
                    }
                    

                    Db.RollbackTran();
                    return false;
                }
@@ -171,7 +171,7 @@
            }
            catch (Exception e)
            {
                throw new Exception("删除出库单明细失败："+e.Message);
                throw new Exception("删除出库单明细失败：" + e.Message);
            }
        }


 Wms/WMS.BLL/SysServer/MaterialsServer.cs

@@ -158,6 +158,10 @@
            mate.IsControlled = string.IsNullOrWhiteSpace(mate.IsControlled) ? "0" : mate.IsControlled; //是否受控
            mate.IsInspect = string.IsNullOrWhiteSpace(mate.IsInspect) ? "0" : mate.IsInspect; //是否免检
            mate.IsPasteCode = string.IsNullOrWhiteSpace(mate.IsPasteCode) ? "0" : mate.IsPasteCode; //是否免检

            //是否批次管理
            mate.IsLotManage = string.IsNullOrWhiteSpace(mate.IsLotManage) ? "0" : mate.IsLotManage;

            mate.Origin = "WMS"; //来源
            mate.IsDel = "0";
            mate.CreateTime = DateTime.Now;
@@ -238,7 +242,7 @@
        #endregion

        #region erp
        

        /// <summary>
        /// 获取erp数据
        /// </summary>

 Wms/WMS.Entity/SysEntity/SysMaterials.cs

@@ -74,7 +74,7 @@
        /// 理论重量
        /// </summary>
        public decimal? Weight { get; set; }
        

        /// <summary>
        /// 保质期
        /// </summary>
@@ -121,17 +121,54 @@
        public string CategoryNo { get; set; }


        /// <summary>
        /// CAS号
        /// </summary>
        public string CasNo { get; set; }

        /// <summary>
        /// 是否批次管理
        /// </summary>
        public string IsLotManage { get; set; }

        /// <summary>
        /// 留样时间
        /// </summary>
        public string LeaveTime { get; set; }

        /// <summary>
        /// 液体物料闪点
        /// </summary>
        public string LiquidFlashPoint { get; set; }

        /// <summary>
        /// 危险货位信息
        /// </summary>
        public string DangerLocatInfo { get; set; }

        /// <summary>
        /// 灭火方式
        /// </summary>
        public string OutFireMethod { get; set; }

        /// <summary>
        /// 物料禁忌
        /// </summary>
        public string MaterialTaboo { get; set; }



        [Navigate(NavigateType.OneToOne, nameof(Type))]
        public SysDictionary TypeInfo { get; set; }

        [Navigate(NavigateType.OneToOne, nameof(Environment))]
        public SysDictionary EnvironmentInfo { get; set; }

        [Navigate(NavigateType.OneToOne, nameof(UnitNo),nameof(SysUnit.UnitNo))]
        [Navigate(NavigateType.OneToOne, nameof(UnitNo), nameof(SysUnit.UnitNo))]
        public SysUnit UnitInfo { get; set; }

        [Navigate(NavigateType.OneToOne, nameof(PackagNo), nameof(SysPackag.PackagNo))]
        public SysPackag PackagInfo { get; set; }
        

    }
}