HTML/views/SOSetting/ExportHandOutList.html

@@ -392,7 +392,7 @@
                            }
                            var item = {
                                StockId: parseInt(infoOptions.data[i].Id),
                                Qty: parseInt(infoOptions.data[i].ExportQty)
                                Qty: parseFloat(infoOptions.data[i].ExportQty)
                            };
                            DataList.push(item);
                        }

 Wms/Utility/Tools/HttpHelper.cs

@@ -217,14 +217,35 @@
                //修改参数的值
                foreach (var de in Pars)
                {
                    string subNode = "DataList/Product/Batch";// + de.Key.ToString();
                    string subNode = "DataList/Events/Event/Relation/Batch";// + de.Key.ToString();
                    
                    XmlNode node = xml.SelectSingleNode(subNode, nsmgr);
                    if (de != null)
                    {
                        XmlNode createNode = xml.CreateNode(XmlNodeType.Element, "Data", "");
                        XmlAttribute attr = xml.CreateAttribute("code");
                        attr.Value = de;
                        XmlAttribute attr = xml.CreateAttribute("Code");  //箱码
                        attr.Value = de.Split(",")[0];
                        createNode.Attributes.Append(attr);
                        attr = xml.CreateAttribute("CorpOrderID");   //单据号
                        attr.Value = de.Split(",")[1];
                        createNode.Attributes.Append(attr);
                        attr = xml.CreateAttribute("Actor");      //操作人
                        attr.Value = de.Split(",")[2];
                        createNode.Attributes.Append(attr);
                        attr = xml.CreateAttribute("ActDate");     //操作时间
                        attr.Value = de.Split(",")[3];
                        createNode.Attributes.Append(attr);
                        attr = xml.CreateAttribute("DisCorpID");  //运输企业
                        attr.Value = "";
                        createNode.Attributes.Append(attr);
                        attr = xml.CreateAttribute("AssCorpID");   //委托企业
                        attr.Value = "";
                        createNode.Attributes.Append(attr);
                        attr = xml.CreateAttribute("ToCorpID");  // 下游收货企业编号
                        attr.Value = "";
                        createNode.Attributes.Append(attr);
                        attr = xml.CreateAttribute("FromPerson");//发货人
                        attr.Value = "";   //de.Split(",")[2]
                        createNode.Attributes.Append(attr);
                        node.AppendChild(createNode);
                    }

 Wms/Utility/XML/ExInfoXml.xml

@@ -1,10 +1,100 @@

<DataList xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" corpName="天津市中升挑战生物科技有限公司" 
          toUnitType="2" manCode="19053107" dataType="wareHouseOut" version="1.1" 
          xsi:noNamespaceSchemaLocation="兽药产品出库数据1.1.xsd">
    <Product>
        <Batch operator="申报设备名称" oprDate="2022/06/25" toProvince="黑龙江省" toCity="哈尔滨市" toCounty="双城区" toUnit="哈尔滨源策商贸有限公司" toUnitcode="">
            <!--<Data code="202203240009000479940290"/>-->
        </Batch>
    </Product>
<DataList xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="关联关系XML Schema-3.0.xsd" License="">
    <Events version="3.0">
        <Event name="RelationCreate">
            <Relation productCode="9227834" subTypeNo="9227834001" cascade="1:8:80" packageSpec="盒1支" comment="">
                <Batch batchNo="4202506237" madeDate="2025-06-05" validateDate="2028-06-04" workshop="1002车间" lineName="自动线" lineManager="赵">
                    <!--<Code curCode="87069080001788999534" packLayer="3" parentCode="" flag="0"/>
                        <Code curCode="87069090015932071630" packLayer="2" parentCode="87069080001788999534" flag="0"/>
                        <Code curCode="83057920148372924155" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="83057920148372684374" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="83057920148372441040" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="83057920148370761719" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="83057920148371009170" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="83057920148371243667" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="83057920148371481519" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="83057920148371726602" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="83057920148371962746" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="83057920148372200959" packLayer="1" parentCode="87069090015932071630" flag="0"/>
                        <Code curCode="87069090015932115065" packLayer="2" parentCode="87069080001788999534" flag="0"/>
                        <Code curCode="83057920148368842018" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="83057920148369084666" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="83057920148369326241" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="83057920148369562000" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="83057920148369801304" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="83057920148370045482" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="83057920148370284324" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="83057920148370528448" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="83057920148368600956" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="83057920148368363066" packLayer="1" parentCode="87069090015932115065" flag="0"/>
                        <Code curCode="87069090015932154162" packLayer="2" parentCode="87069080001788999534" flag="0"/>
                        <Code curCode="83057920148368124892" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="83057920148367880401" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="83057920148365962203" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="83057920148366207259" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="83057920148366440713" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="83057920148366684405" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="83057920148366920612" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="83057920148367161006" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="83057920148367402706" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="83057920148367647629" packLayer="1" parentCode="87069090015932154162" flag="0"/>
                        <Code curCode="87069090015932238090" packLayer="2" parentCode="87069080001788999534" flag="0"/>
                        <Code curCode="83057920148363561861" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="83057920148363808974" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="83057920148364044168" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="83057920148364281458" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="83057920148364520482" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="83057920148364767590" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="83057920148365004077" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="83057920148365245110" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="83057920148365489268" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="83057920148365726586" packLayer="1" parentCode="87069090015932238090" flag="0"/>
                        <Code curCode="87069090015932033782" packLayer="2" parentCode="87069080001788999534" flag="0"/>
                        <Code curCode="83057920148373401736" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="83057920148373648671" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="83057920148373882492" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="83057920148374121088" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="83057920148374369286" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="83057920148374604933" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="83057920148373169131" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="83057920148374848657" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="83057920148375329523" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="83057920148375081870" packLayer="1" parentCode="87069090015932033782" flag="0"/>
                        <Code curCode="87069090015931913483" packLayer="2" parentCode="87069080001788999534" flag="0"/>
                        <Code curCode="83057920148382283339" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="83057920148382525896" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="83057920148382049580" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="83057920148381808684" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="83057920148381323782" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="83057920148380365101" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="83057920148380600446" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="83057920148380845965" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="83057920148381089410" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="83057920148381561273" packLayer="1" parentCode="87069090015931913483" flag="0"/>
                        <Code curCode="87069090015931956131" packLayer="2" parentCode="87069080001788999534" flag="0"/>
                        <Code curCode="83057920148377962860" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="83057920148378204570" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="83057920148378443550" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="83057920148378686893" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="83057920148378920964" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="83057920148379164311" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="83057920148379406311" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="83057920148379643309" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="83057920148379883846" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="83057920148380125281" packLayer="1" parentCode="87069090015931956131" flag="0"/>
                        <Code curCode="87069090015931993545" packLayer="2" parentCode="87069080001788999534" flag="0"/>
                        <Code curCode="83057920148375560130" packLayer="1" parentCode="87069090015931993545" flag="0"/>
                        <Code curCode="83057920148375806129" packLayer="1" parentCode="87069090015931993545" flag="0"/>
                        <Code curCode="83057920148376048063" packLayer="1" parentCode="87069090015931993545" flag="0"/>
                        <Code curCode="83057920148376281992" packLayer="1" parentCode="87069090015931993545" flag="0"/>
                        <Code curCode="83057920148376529495" packLayer="1" parentCode="87069090015931993545" flag="0"/>
                        <Code curCode="83057920148376765510" packLayer="1" parentCode="87069090015931993545" flag="0"/>
                        <Code curCode="83057920148377000472" packLayer="1" parentCode="87069090015931993545" flag="0"/>
                        <Code curCode="83057920148377245836" packLayer="1" parentCode="87069090015931993545" flag="0"/>
                        <Code curCode="83057920148377489066" packLayer="1" parentCode="87069090015931993545" flag="0"/>
                        <Code curCode="83057920148377721035" packLayer="1" parentCode="87069090015931993545" flag="0"/>-->
                </Batch>
            </Relation>
        </Event>
    </Events>
</DataList>

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -143,10 +143,14 @@
                    var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
                    if (newPalletInfo == null)
                    {
                        var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew &&(m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
                        throw Oops.Bah("新托盘信息不存在！");
                    }
                    if (newPalletInfo.Status == "0")
                    {
                        var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
                        if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
                        {
                            throw Oops.Bah("新托盘信息不存在或已被使用！");
                            throw Oops.Bah("一个托盘只能接受一个出库单拼托！");
                        }
                    }
                    else

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -2731,7 +2731,9 @@
                        //还需要分配的数量
                        decimal needQty = detail.Qty - (detail.AllotQty == null ? 0 : decimal.Parse(detail.AllotQty.ToString()));
                        //库存明细 Status 0：待分配 1：部分分配  2：已分配 
                        var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.SkuNo == detail.SkuNo && (m.Qty - m.FrozenQty - m.LockQty + m.InspectQty) > 0 && (m.Status == "0" || m.Status == "1") && m.IsDel == "0").ToList();
                        var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.SkuNo == detail.SkuNo && (m.Qty - m.FrozenQty - m.LockQty + m.InspectQty) > 0 && (m.Status == "0" || m.Status == "1") && m.IsDel == "0"
                        && m.AreaNo != "B06" && m.AreaNo != "B07" && m.AreaNo != "B09" && m.AreaNo != "B24")//排除车间库存
                            .ToList();


                        //判断单号是否指定批次
@@ -3156,7 +3158,8 @@
                        m => m.SkuNo.Contains(msg.Trim())
                             || m.SkuName.Contains(msg.Trim())
                             || m.LocatNo.Contains(msg.Trim()))
                    .And(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo && m.LotNo == detail.LotNo && (m.Status == "0" || m.Status == "1"))
                    .And(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo && m.LotNo == detail.LotNo && (m.Status == "0" || m.Status == "1")
                        && m.AreaNo != "B06" && m.AreaNo != "B07" && m.AreaNo != "B09" && m.AreaNo != "B24")//排除车间库存
                    .ToExpression();//注意 这一句 不能少

                var list = Db.Queryable<DataStockDetail>().Where(item).Select(a => new StockDetailDto

 Wms/Wms/Controllers/BasisController.cs

@@ -64,9 +64,9 @@
        /// <param name="department">部门</param>
        /// <param name="setting">功能设定</param>
        /// <param name="operation">操作日志</param>
        public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer, 
            IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc, 
            IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting, 
        public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer,
            IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc,
            IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting,
            IInterfaceServer interfaceS, IOperationSysServer operation, UserManager userManager)
        {
            _customerSvc = customerSvc;//客户Svc
@@ -362,7 +362,7 @@
        {
            Stopwatch stopwatch = new Stopwatch();
            stopwatch.Start();
            var model =  await _roleRightServer.GetRoleMenuList();
            var model = await _roleRightServer.GetRoleMenuList();
            stopwatch.Stop();

            var time = stopwatch.ElapsedMilliseconds;
@@ -626,7 +626,7 @@
            var bolls = await _mate.GetMateList(model, count);

            //return new SqlSugarPagedList() { Items = bolls, Total = count };
            return Ok(new { code = 0, count=count.Value, msg = "物料信息", data = bolls });
            return Ok(new { code = 0, count = count.Value, msg = "物料信息", data = bolls });
        }

        /// <summary>