Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-001...

pulg

9 天以前 91fc6f65c712505f0b13e45d66e917e2645ae1c3

 HH.WCS.QingXiNongfu/process/TaskProcess.cs

@@ -417,16 +417,14 @@
                    goto vvv;
                }

                if (mst.S_TYPE.Trim() == "J空瓶坯-出库")
                {
                    mst.S_CNTRS = "J" + Settings.GetTimeStamp();
                }

                if (mst.S_TYPE.Trim() == "F空瓶坯-出库")
                {
                    mst.S_CNTRS = "F" + Settings.GetTimeStamp();
                }

                //if (mst.S_TYPE.Trim() == "J空瓶坯-出库")
                //{
                //    mst.S_CNTRS = "J" + Settings.GetTimeStamp();
                //}
                //if (mst.S_TYPE.Trim() == "F空瓶坯-出库")
                //{
                //    mst.S_CNTRS = "F" + Settings.GetTimeStamp();
                //}
                //成品空框 不需要绑筐
                if (!mst.S_TYPE.Trim().Contains("成品-空托上线")
                    && mst.S_TYPE.Trim() != "满瓶坯-入库"
@@ -846,7 +844,6 @@
                            return true;
                        });
                    }

                }
                else if (mst.S_TYPE.Trim() == "空瓶坯-出库" || mst.S_TYPE.Trim().Contains("瓶盖-空上机") || mst.S_TYPE.Trim().Contains("翻斗机叫满"))
                {