4-24

xiaojiao

13 小时以前 557f02072fa311eefe3123aa44afebac22adc465

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

@@ -59,6 +59,8 @@
                //轮对号
                string ldCode = saveModel.MainData["ldCode"].ToString();

                //轴承产地(国产/进口)
                string Placeoforigin = saveModel.MainData["Placeoforigin"].ToString();

                //左出库轴承
                VV_ContainerInfo leftContainer = null;
@@ -88,7 +90,8 @@
                    List<VV_ContainerInfo> listContainer = VV_ContainerInfoRepository.Instance.Find(r => !r.location_islocked
             && r.location_state == LocationState.LocationState_Stored.ToString() && r.containerdtl_madeUnit == Manufacturer
            && r.containerdtl_standard.Contains(zcState) && r.materiel_id == materiel && r.containerdtl_standardResult == 1
             && (string.IsNullOrEmpty(r.csize_out_result) || r.csize_out_result == "合格"));
                    && (string.IsNullOrEmpty(r.csize_out_result) || r.csize_out_result == "合格") && r.containerdtl_qualityCheck == true
                    && r.containerdtl_takeGoogsCheck == true && r.Placeoforigin == Placeoforigin);

                    //listContainer = listContainer.OrderBy(x => DateTime.ParseExact(x.containerdtl_ProductDate,"yyyy-MM-dd",CultureInfo.InvariantCulture)).ToList();

@@ -238,6 +241,9 @@
                // è½´æ‰¿ç¼–码
                string Bearing_code = saveModel.MainData["Bearing_code"].ToString();

                //轴承产地(国产/进口)
                string Placeoforigin = saveModel.MainData["Placeoforigin"].ToString();

                // èŽ·å–轴承详情数据和测量的数据
                Dt_container_size_info_hty size_info_hty = Dt_container_size_info_htyRepository.Instance.Find(x => x.csize_barcode == Bearing_code).ToList().LastOrDefault();
                Dt_container_detail_hty detail_hty = Dt_container_detail_htyRepository.Instance.Find(x => x.containerdtl_goodsCode == Bearing_code).ToList().LastOrDefault();
@@ -285,6 +291,11 @@
                        return content.Error("轴承新旧状态不一致 ä¸èƒ½è¿›è¡Œæ‰‹åŠ¨é€‰é…");
                    }

                    if (!(detail_hty.Placeoforigin == Placeoforigin))
                    {
                        return content.Error("产地不一致 ä¸èƒ½è¿›è¡Œæ‰‹åŠ¨é€‰é…");
                    }

                    if ("left".Equals(ZCdirection))
                    {
                        string left_result = GetContainer2(listStandard, size_info_hty, zzjAVG, zfcbAVG, zydAVG, "left");