试生产版本

xiaojiao

9 天以前 b532ba8806996246ab7a0896bf34b884c47dee7e

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/AddBoxContainer.cs

@@ -5,6 +5,7 @@
using WIDESEA.Core.ManageUser;
using WIDESEA.Entity.DomainModels;
using WIDESEA.Services.Repositories;
using static WIDESEA_Entity.CustomModels.RGVModel.RgvDeviceStatusModel;

namespace WIDESEA.Services.Services
{
@@ -21,13 +22,13 @@
            if (boxHead == null || boxDetail == null || goodsInfo == null)
                throw new Exception($"没有找到对任务托盘号：【{taskInfo.task_barcode}】对应的组盘信息或者是录入信息");

            //这里是获取空托盘重量，调试占时注释
            Dt_container_head_hty container_Head_Hty = Dt_container_head_htyRepository.Instance.Find(x => x.containerhead_barcode == taskInfo.task_barcode
            && x.containerhead_operatetype == "empty" && x.containerhead_creator != "WCS" && !string.IsNullOrEmpty(x.containerhead_palletweight) && "0" != x.containerhead_palletweight)
                .OrderByDescending(x => x.containerhead_finishtime).First();
            

            //这里获取空托盘的重量
            Dt_EmptyPallet dt_EmptyPallet = Dt_EmptyPalletRepository.Instance.Find(x => x.EmptyPallet_name == taskInfo.task_barcode).First();


            if (container_Head_Hty == null)
            if (dt_EmptyPallet == null)
                throw new Exception($"没有找到对任务托盘号：【{taskInfo.task_barcode}】对应的空托盘出库记录");
            //0不合格,1合格
            int weighingResult = 0;
@@ -36,13 +37,14 @@
            if (null != standars)
            {
                //当前轴承 
                decimal currentWeighing = (decimal.Parse(taskInfo.task_weight) - decimal.Parse(container_Head_Hty.containerhead_palletweight))
                decimal currentWeighing = (decimal.Parse(taskInfo.task_weight) - decimal.Parse(dt_EmptyPallet.EmptyPallet_palletweight))
                    + standars.weighing_addWeighing.GetValueOrDefault();
                //是否计算
                if (standars.weighing_isCompute == 1)
                {
                    //差异值  
                    decimal differencWeiging = standars.weighing_standard_value.GetValueOrDefault() - currentWeighing;
                    // decimal differencWeiging = standars.weighing_standard_value.GetValueOrDefault() - currentWeighing;
                    decimal differencWeiging = int.Parse(goodsInfo.mesInfo_bak_3) - currentWeighing; // è‚–佼修成
                    if (differencWeiging < 0)
                    {
                        if (standars.weighing_positive_value >= -differencWeiging)
@@ -57,13 +59,17 @@
                else
                    weighingResult = 1;
            }
            else // è‚–佼加的否则判断
            {
                weighingResult = 1; 
            }

            Dt_container_head conHead = new Dt_container_head();
            conHead.containerhead_id = Guid.NewGuid();
            conHead.containerhead_barcode = taskInfo.task_barcode;
            conHead.containerhead_creator = taskInfo.task_creator;
            conHead.containerhead_createtime = DateTime.Now;
            conHead.containerhead_palletweight = container_Head_Hty.containerhead_palletweight;
            conHead.containerhead_palletweight = dt_EmptyPallet.EmptyPallet_palletweight;
            Dt_container_headRepository.Instance.Add(conHead, true);

            Dt_container_detail conDetail = new Dt_container_detail();
@@ -82,11 +88,23 @@
            conDetail.containerdtl_madeUnit = goodsInfo.mesInfo_madeUnit;
            conDetail.containerdtl_number = goodsInfo.mesInfo_number;
            conDetail.containerdtl_goodsCode = goodsInfo.mesInfo_qrCode;
            conDetail.containerdtl_goodsWeight = ((decimal.Parse(taskInfo.task_weight) - decimal.Parse(container_Head_Hty.containerhead_palletweight))
                + standars.weighing_addWeighing.GetValueOrDefault()).ToString();
            conDetail.Standard_value = goodsInfo.mesInfo_bak_3; // è‚–佼加上这个

            conDetail.containerdtl_goodsWeight = "0"; // è‚–佼加上了这个if 92 - 100行
            if (standars != null)
            {
                if (standars.weighing_isCompute == 1) 
                {
                    conDetail.containerdtl_goodsWeight = ((decimal.Parse(taskInfo.task_weight) - decimal.Parse(dt_EmptyPallet.EmptyPallet_palletweight))
                    + standars.weighing_addWeighing.GetValueOrDefault()).ToString();
                }
            }
            
                
            conDetail.containerdtl_creator = taskInfo.task_creator;
            conDetail.containerdtl_createtime = DateTime.Now;
            conDetail.containerdtl_text1 = "未测量";
            conDetail.containerdtl_text3 = "未复检";

            //称重结果
            conDetail.containerdtl_standardResult = weighingResult;