产成品交接后，不能变更商标

DK.Client/PMModule/F_PM_2118.cs

@@ -197,13 +197,24 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                     this.txtBarcode.Text = "";
                     //this.DialogResult = DialogResult.OK;
                 }
-                else if (returnValue == 0)
+                else if (returnValue == -2)
+                {
+                    // 提示信息
+                    MessageBox.Show("条码不存在",
+                        this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
+                else if (returnValue == -3)
+                {
+                    // 提示信息
+                    MessageBox.Show("已交接的产品不能变更商标",
+                        this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
+                else
                 {
                     // 提示信息
                     MessageBox.Show("保存失败",
                         this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 }
-
             }
             catch (Exception ex)
             {
@@ -288,6 +299,20 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                     if (dsCheckBarcode != null && dsCheckBarcode.Tables[0].Rows.Count > Constant.INT_IS_ZERO)
                     {
                         this._barcode = this.txtBarcode.Text.Trim();
+
+                        string err_msg = dsCheckBarcode.Tables[0].Rows[0]["err_msg"] + "";
+                        if (!string.IsNullOrWhiteSpace(err_msg))
+                        {
+                            MessageBox.Show(err_msg,
+                                   this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                            this.txtBarcode.Text = "";
+                            this.txtOrgLogo.Text = "";
+                            this.txtLogo.Text = "";
+                            this._barcode = "";
+                            this.cmbLogo.SelectedValue = defaultlogoid;
+                            return;
+                        }
+
                         this.txtOrgLogo.Text = dsCheckBarcode.Tables[0].Rows[0]["logoname"].ToString() + "[" + dsCheckBarcode.Tables[0].Rows[0]["logocode"].ToString() + "]";
                        
                         //this.cmbLogo.SelectedValue = dsCheckBarcode.Tables[0].Rows[0]["logoid"].ToString();

DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -2872,11 +2872,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                 };
                 barcode = con.GetSqlResultToStr(sqlString, paras1);
 
-                sqlString = @"select g.LogoID,l.logocode,l.logoname, g.glazetypeid, d.DICTIONARYVALUE glazetypename, g.goodsid
+                sqlString = @"select g.LogoID,l.logocode,l.logoname, g.glazetypeid, d.DICTIONARYVALUE glazetypename, g.goodsid, f.fhuserid, '' err_msg
                                 from tp_pm_groutingdailydetail g
-                                     left join tp_mst_logo l
-                                     on g.logoid=l.logoid
+                                     left join tp_mst_logo l on g.logoid=l.logoid
                                      left join TP_MST_DataDictionary d on d.DICTIONARYID = g.glazetypeid
+                                     left join tp_pm_finishedproduct f on g.barcode = f.barcode
                                         where g.barcode=:barcode";
                 OracleParameter[] paras = new OracleParameter[]{
                     new OracleParameter(":barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input),
@@ -2884,6 +2884,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 DataSet ds = con.GetSqlResultToDs(sqlString, paras);
                 if (ds != null && ds.Tables[0].Rows.Count > 0)
                 {
+                    object fhuserid = ds.Tables[0].Rows[0]["fhuserid"];
+                    if (fhuserid != null && fhuserid != DBNull.Value)
+                    {
+                        ds.Tables[0].Rows[0]["err_msg"] = "已交接的产品不能变更商标";
+                    }
                     return ds;
                 }
                 return null;

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -16398,10 +16398,32 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 object pid = null;
                 string sql = "";
 
-                sql = @"select logoid from tp_pm_groutingdailydetail where barcode=:barcode";
-                oldLogoID = oracleTrConn.GetSqlResultToObj(sql, new OracleParameter[]{
+                //sql = @"select logoid from tp_pm_groutingdailydetail where barcode=:barcode";
+                //oldLogoID = oracleTrConn.GetSqlResultToObj(sql, new OracleParameter[]{
+                //        new OracleParameter(":barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input)
+                //    });
+                sql = @"select g.logoid, f.fhuserid from tp_pm_groutingdailydetail g
+                        left join tp_pm_finishedproduct f on g.barcode = f.barcode
+                        where g.barcode=:barcode";
+
+                DataTable dt = oracleTrConn.GetSqlResultToDt(sql, new OracleParameter[]{
                         new OracleParameter(":barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input)
                     });
+                if (dt != null && dt.Rows.Count > 0)
+                {
+                    oldLogoID = dt.Rows[0]["logoid"];
+                    object fhuserid = dt.Rows[0]["fhuserid"];
+                    if (oldLogoID == null || oldLogoID == DBNull.Value)
+                    {
+                        // 条码不存在
+                        return -2;
+                    }
+                    if (fhuserid != null && fhuserid != DBNull.Value)
+                    {
+                        // "已交接的产品不能变更商标";
+                        return -3;
+                    }
+                }
 
                 // 1.更新注浆明细
                 sql = @"update tp_pm_groutingdailydetail set logoid=:logoid,updateuserid=:updateuserid where barcode=:barcode";
@@ -21068,6 +21090,94 @@ updateuserid=:updateuserid where barcode=:barcode";
                 //DateTime datebegin = date.Date;
                 //DateTime dateend = date.Date.AddDays(1);
 
+                //sqlString =
+                //"SELECT :yyyymmdd AS yyyymmdd\n" +
+                //"      ,SYSDATE AS createtime\n" +
+                //"      ,tt.goodscode\n" +
+                //"      ,tt.sapcode\n" +
+                //"      ,tt.usercode\n" +
+                //"      ,tt.ordercode\n" +
+                //"      ,tt.orderitem\n" +
+                //"      ,tt.zscs\n" +
+                //"      ,to_char(tt.outputnum) AS outputnum\n" +
+                //"      ,to_char(tt.recoverynum) AS recoverynum\n" +
+                //"  FROM (SELECT t.goodscode\n" +
+                //"              ,t.sapcode\n" +
+                //"              ,t.usercode\n" +
+                //"              ,t.ordercode\n" +
+                //"              ,t.orderitem\n" +
+                //"              ,t.zscs\n" +
+                //"              ,SUM(decode(t.recyclingflag, '1', 0, decode(t.datatype, 51, 1, -1))) outputnum\n" +
+                //"              ,SUM(decode(t.recyclingflag, '0', 0, decode(t.datatype, 51, 1, -1))) recoverynum\n" +
+                //"          FROM (SELECT gh.goodscode\n" +
+                //"                      ,gh.sapcode\n" +
+                //"                      ,u.usercode\n" +
+                //"                      ,o.orderno\n" +
+                //"                      ,bar.recyclingflag\n" +
+                //"                      ,gh.datatype\n" +
+                //"                      ,'' zscs\n" +
+                ////"                      ,case when g.goods_line_type = 1 or gl.highpressureflag = '1' then 'G' else 'L' end zscs\n" +
+                //"                      ,CASE\n" +
+                //"                           WHEN o.orderid IS NULL\n" +
+                //"                                OR o.orderno LIKE 'HEGII%' THEN\n" +
+                //"                            ' '\n" +
+                //"                           WHEN instr(o.orderno, '/') = 0 THEN\n" +
+                //"                            to_char(o.orderno)\n" +
+                //"                           ELSE\n" +
+                //"                            to_char(substr(o.orderno, 1, instr(o.orderno, '/') - 1))\n" +
+                //"                       END ordercode -- 销售凭证\n" +
+                //"                      ,CASE\n" +
+                //"                           WHEN o.orderid IS NULL\n" +
+                //"                                OR o.orderno LIKE 'HEGII%'\n" +
+                //"                                OR instr(o.orderno, '/') = 0 THEN\n" +
+                //"                            '0'\n" +
+                //"                           WHEN instr(o.orderno, '#') = 0 THEN\n" +
+                //"                            to_char(substr(o.orderno, instr(o.orderno, '/') + 1))\n" +
+                //"                           ELSE\n" +
+                //"                            to_char(substr(o.orderno\n" +
+                //"                                          ,instr(o.orderno, '/') + 1\n" +
+                //"                                          ,instr(o.orderno, '#') - instr(o.orderno, '/') - 1))\n" +
+                //"                       END orderitem -- 销售凭证项目\n" +
+                //"                  FROM (SELECT gch.goodscode\n" +
+                //"                              ,gch.sapcode\n" +
+                //"                              ,decode(gch.datatype, 53, 51, gch.datatype) datatype\n" +
+                //"                              ,gch.userid\n" +
+                //"                              ,gch.groutingdailydetailid\n" +
+                //"                              ,gch.otherid\n" +
+                //"                          FROM tp_pm_goodschangehistory gch\n" +
+                //"                         WHERE gch.datatype IN (51, 52, 53)\n" +
+                //"                        UNION ALL\n" +
+                //"                        SELECT gch.goodscode\n" +
+                //"                              ,gch.sapcode\n" +
+                //"                              ,52 datatype\n" +
+                //"                              ,gch.userid\n" +
+                //"                              ,gch.groutingdailydetailid\n" +
+                //"                              ,gch.goodsidafter\n" +
+                //"                          FROM tp_pm_goodschangehistory gch\n" +
+                //"                         WHERE gch.datatype = 53) gh\n" +
+                //"                 INNER JOIN tp_mst_user u\n" +
+                //"                    ON u.userid = gh.userid\n" +
+                //"                 INNER JOIN tp_pm_groutingdailydetail bar\n" +
+                //"                    ON bar.groutingdailydetailid = gh.groutingdailydetailid\n" + fifter +
+                ////"                   AND bar.barcode IN (" + fifter + ")\n" +
+                //"                 INNER JOIN tp_pc_groutingline gl\n" +
+                //"                    ON gl.groutinglineid = bar.groutinglineid\n" +
+                //"                 INNER JOIN tp_mst_goods g\n" +
+                //"                    ON g.goodsid = bar.goodsid\n" +
+                //"                  LEFT JOIN tp_pm_order o\n" +
+                //"                    ON o.orderid = gh.otherid) t\n" +
+                //"         GROUP BY t.goodscode\n" +
+                //"                 ,t.sapcode\n" +
+                //"                 ,t.usercode\n" +
+                //"                 ,t.ordercode\n" +
+                //"                 ,t.orderitem,t.zscs) tt\n" +
+                //" WHERE tt.outputnum <> 0\n" +
+                //"    OR tt.recoverynum <> 0\n" +
+                //" ORDER BY tt.goodscode\n" +
+                //"         ,tt.sapcode\n" +
+                //"         ,tt.usercode\n" +
+                //"         ,tt.ordercode\n" +
+                //"         ,tt.orderitem,tt.zscs";
                 sqlString =
                 "SELECT :yyyymmdd AS yyyymmdd\n" +
                 "      ,SYSDATE AS createtime\n" +
@@ -21085,14 +21195,18 @@ updateuserid=:updateuserid where barcode=:barcode";
                 "              ,t.ordercode\n" +
                 "              ,t.orderitem\n" +
                 "              ,t.zscs\n" +
-                "              ,SUM(decode(t.recyclingflag, '1', 0, decode(t.datatype, 51, 1, -1))) outputnum\n" +
-                "              ,SUM(decode(t.recyclingflag, '0', 0, decode(t.datatype, 51, 1, -1))) recoverynum\n" +
-                "          FROM (SELECT gh.goodscode\n" +
-                "                      ,gh.sapcode\n" +
-                "                      ,u.usercode\n" +
+                //"              ,SUM(decode(t.recyclingflag, '1', 0, decode(t.datatype, 51, 1, -1))) outputnum\n" +
+                //"              ,SUM(decode(t.recyclingflag, '0', 0, decode(t.datatype, 51, 1, -1))) recoverynum\n" +
+                "              ,SUM(decode(t.recyclingflag, '1', 0, 1)) outputnum\n" +
+                "              ,SUM(decode(t.recyclingflag, '0', 0, 1)) recoverynum\n" +
+                "          FROM (SELECT bar.goodscode\n" +
+                //"                      ,gh.sapcode\n" +
+                //"                      ,u.usercode\n" +
+                "                      ,bar.materialcode sapcode\n" +
+                "                      ,gh.fhusercode usercode\n" +
                 "                      ,o.orderno\n" +
                 "                      ,bar.recyclingflag\n" +
-                "                      ,gh.datatype\n" +
+                //"                      ,gh.datatype\n" +
                 "                      ,'' zscs\n" +
                 //"                      ,case when g.goods_line_type = 1 or gl.highpressureflag = '1' then 'G' else 'L' end zscs\n" +
                 "                      ,CASE\n" +
@@ -21116,34 +21230,18 @@ updateuserid=:updateuserid where barcode=:barcode";
                 "                                          ,instr(o.orderno, '/') + 1\n" +
                 "                                          ,instr(o.orderno, '#') - instr(o.orderno, '/') - 1))\n" +
                 "                       END orderitem -- 销售凭证项目\n" +
-                "                  FROM (SELECT gch.goodscode\n" +
-                "                              ,gch.sapcode\n" +
-                "                              ,decode(gch.datatype, 53, 51, gch.datatype) datatype\n" +
-                "                              ,gch.userid\n" +
-                "                              ,gch.groutingdailydetailid\n" +
-                "                              ,gch.otherid\n" +
-                "                          FROM tp_pm_goodschangehistory gch\n" +
-                "                         WHERE gch.datatype IN (51, 52, 53)\n" +
-                "                        UNION ALL\n" +
-                "                        SELECT gch.goodscode\n" +
-                "                              ,gch.sapcode\n" +
-                "                              ,52 datatype\n" +
-                "                              ,gch.userid\n" +
-                "                              ,gch.groutingdailydetailid\n" +
-                "                              ,gch.goodsidafter\n" +
-                "                          FROM tp_pm_goodschangehistory gch\n" +
-                "                         WHERE gch.datatype = 53) gh\n" +
-                "                 INNER JOIN tp_mst_user u\n" +
-                "                    ON u.userid = gh.userid\n" +
-                "                 INNER JOIN tp_pm_groutingdailydetail bar\n" +
-                "                    ON bar.groutingdailydetailid = gh.groutingdailydetailid\n" + fifter +
+                "                  FROM tp_pm_groutingdailydetail bar\n" +
+                //"                 INNER JOIN tp_mst_user u\n" +
+                //"                    ON u.userid = gh.userid\n" +
+                "                 INNER JOIN tp_pm_finishedproduct gh\n" +
+                "                    ON bar.groutingdailydetailid = gh.groutingdailydetailid\n" +
                 //"                   AND bar.barcode IN (" + fifter + ")\n" +
-                "                 INNER JOIN tp_pc_groutingline gl\n" +
-                "                    ON gl.groutinglineid = bar.groutinglineid\n" +
-                "                 INNER JOIN tp_mst_goods g\n" +
-                "                    ON g.goodsid = bar.goodsid\n" +
+                //"                 INNER JOIN tp_pc_groutingline gl\n" +
+                //"                    ON gl.groutinglineid = bar.groutinglineid\n" +
+                //"                 INNER JOIN tp_mst_goods g\n" +
+                //"                    ON g.goodsid = bar.goodsid\n" +
                 "                  LEFT JOIN tp_pm_order o\n" +
-                "                    ON o.orderid = gh.otherid) t\n" +
+                "                    ON o.orderid = gh.fhorderid where 1=1 " + fifter + ") t\n" +
                 "         GROUP BY t.goodscode\n" +
                 "                 ,t.sapcode\n" +
                 "                 ,t.usercode\n" +
@@ -21708,6 +21806,94 @@ updateuserid=:updateuserid where barcode=:barcode";
                 //DateTime datebegin = date.Date;
                 //DateTime dateend = date.Date.AddDays(1);
 
+                //sqlString =
+                //"SELECT :yyyymmdd AS yyyymmdd\n" +
+                //"      ,SYSDATE AS createtime\n" +
+                //"      ,tt.goodscode\n" +
+                //"      ,tt.sapcode\n" +
+                //"      ,tt.usercode\n" +
+                //"      ,tt.ordercode\n" +
+                //"      ,tt.orderitem\n" +
+                //"      ,tt.zscs\n" +
+                //"      ,to_char(tt.outputnum) AS outputnum\n" +
+                //"      ,to_char(tt.recoverynum) AS recoverynum\n" +
+                //"  FROM (SELECT t.goodscode\n" +
+                //"              ,t.sapcode\n" +
+                //"              ,t.usercode\n" +
+                //"              ,t.ordercode\n" +
+                //"              ,t.orderitem\n" +
+                //"              ,t.zscs\n" +
+                //"              ,0 - SUM(decode(t.recyclingflag, '1', 0, decode(t.datatype, 51, 1, -1))) outputnum\n" +
+                //"              ,0 - SUM(decode(t.recyclingflag, '0', 0, decode(t.datatype, 51, 1, -1))) recoverynum\n" +
+                //"          FROM (SELECT gh.goodscode\n" +
+                //"                      ,gh.sapcode\n" +
+                //"                      ,u.usercode\n" +
+                //"                      ,o.orderno\n" +
+                //"                      ,bar.recyclingflag\n" +
+                //"                      ,gh.datatype\n" +
+                //"                      ,'' zscs\n" +
+                ////"                      ,case when g.goods_line_type = 1 or gl.highpressureflag = '1' then 'G' else 'L' end zscs\n" +
+                //"                      ,CASE\n" +
+                //"                           WHEN o.orderid IS NULL\n" +
+                //"                                OR o.orderno LIKE 'HEGII%' THEN\n" +
+                //"                            ' '\n" +
+                //"                           WHEN instr(o.orderno, '/') = 0 THEN\n" +
+                //"                            to_char(o.orderno)\n" +
+                //"                           ELSE\n" +
+                //"                            to_char(substr(o.orderno, 1, instr(o.orderno, '/') - 1))\n" +
+                //"                       END ordercode -- 销售凭证\n" +
+                //"                      ,CASE\n" +
+                //"                           WHEN o.orderid IS NULL\n" +
+                //"                                OR o.orderno LIKE 'HEGII%'\n" +
+                //"                                OR instr(o.orderno, '/') = 0 THEN\n" +
+                //"                            '0'\n" +
+                //"                           WHEN instr(o.orderno, '#') = 0 THEN\n" +
+                //"                            to_char(substr(o.orderno, instr(o.orderno, '/') + 1))\n" +
+                //"                           ELSE\n" +
+                //"                            to_char(substr(o.orderno\n" +
+                //"                                          ,instr(o.orderno, '/') + 1\n" +
+                //"                                          ,instr(o.orderno, '#') - instr(o.orderno, '/') - 1))\n" +
+                //"                       END orderitem -- 销售凭证项目\n" +
+                //"                  FROM (SELECT gch.goodscode\n" +
+                //"                              ,gch.sapcode\n" +
+                //"                              ,decode(gch.datatype, 53, 51, gch.datatype) datatype\n" +
+                //"                              ,gch.userid\n" +
+                //"                              ,gch.groutingdailydetailid\n" +
+                //"                              ,gch.otherid\n" +
+                //"                          FROM tp_pm_goodschangehistory gch\n" +
+                //"                         WHERE gch.datatype IN (51, 52, 53)\n" +
+                //"                        UNION ALL\n" +
+                //"                        SELECT gch.goodscode\n" +
+                //"                              ,gch.sapcode\n" +
+                //"                              ,52 datatype\n" +
+                //"                              ,gch.userid\n" +
+                //"                              ,gch.groutingdailydetailid\n" +
+                //"                              ,gch.goodsidafter\n" +
+                //"                          FROM tp_pm_goodschangehistory gch\n" +
+                //"                         WHERE gch.datatype = 53) gh\n" +
+                //"                 INNER JOIN tp_mst_user u\n" +
+                //"                    ON u.userid = gh.userid\n" +
+                //"                 INNER JOIN tp_pm_groutingdailydetail bar\n" +
+                //"                    ON bar.groutingdailydetailid = gh.groutingdailydetailid\n" + fifter +
+                //"                 INNER JOIN tp_pc_groutingline gl\n" +
+                //"                    ON gl.groutinglineid = bar.groutinglineid\n" +
+                //"                 INNER JOIN tp_mst_goods g\n" +
+                //"                    ON g.goodsid = bar.goodsid\n" +
+                //"                  LEFT JOIN tp_pm_order o\n" +
+                //"                    ON o.orderid = gh.otherid) t\n" +
+                //"         GROUP BY t.goodscode\n" +
+                //"                 ,t.sapcode\n" +
+                //"                 ,t.usercode\n" +
+                //"                 ,t.ordercode\n" +
+                //"                 ,t.orderitem,t.zscs) tt\n" +
+                //" WHERE tt.outputnum <> 0\n" +
+                //"    OR tt.recoverynum <> 0\n" +
+                //" ORDER BY tt.goodscode\n" +
+                //"         ,tt.sapcode\n" +
+                //"         ,tt.usercode\n" +
+                //"         ,tt.ordercode\n" +
+                //"         ,tt.orderitem,tt.zscs";
+
                 sqlString =
                 "SELECT :yyyymmdd AS yyyymmdd\n" +
                 "      ,SYSDATE AS createtime\n" +
@@ -21725,14 +21911,18 @@ updateuserid=:updateuserid where barcode=:barcode";
                 "              ,t.ordercode\n" +
                 "              ,t.orderitem\n" +
                 "              ,t.zscs\n" +
-                "              ,0 - SUM(decode(t.recyclingflag, '1', 0, decode(t.datatype, 51, 1, -1))) outputnum\n" +
-                "              ,0 - SUM(decode(t.recyclingflag, '0', 0, decode(t.datatype, 51, 1, -1))) recoverynum\n" +
-                "          FROM (SELECT gh.goodscode\n" +
-                "                      ,gh.sapcode\n" +
-                "                      ,u.usercode\n" +
+                //"              ,0-SUM(decode(t.recyclingflag, '1', 0, decode(t.datatype, 51, 1, -1))) outputnum\n" +
+                //"              ,0-SUM(decode(t.recyclingflag, '0', 0, decode(t.datatype, 51, 1, -1))) recoverynum\n" +
+                "              ,0-SUM(decode(t.recyclingflag, '1', 0, 1)) outputnum\n" +
+                "              ,0-SUM(decode(t.recyclingflag, '0', 0, 1)) recoverynum\n" +
+                "          FROM (SELECT bar.goodscode\n" +
+                //"                      ,gh.sapcode\n" +
+                //"                      ,u.usercode\n" +
+                "                      ,bar.materialcode sapcode\n" +
+                "                      ,gh.fhusercode usercode\n" +
                 "                      ,o.orderno\n" +
                 "                      ,bar.recyclingflag\n" +
-                "                      ,gh.datatype\n" +
+                //"                      ,gh.datatype\n" +
                 "                      ,'' zscs\n" +
                 //"                      ,case when g.goods_line_type = 1 or gl.highpressureflag = '1' then 'G' else 'L' end zscs\n" +
                 "                      ,CASE\n" +
@@ -21756,33 +21946,18 @@ updateuserid=:updateuserid where barcode=:barcode";
                 "                                          ,instr(o.orderno, '/') + 1\n" +
                 "                                          ,instr(o.orderno, '#') - instr(o.orderno, '/') - 1))\n" +
                 "                       END orderitem -- 销售凭证项目\n" +
-                "                  FROM (SELECT gch.goodscode\n" +
-                "                              ,gch.sapcode\n" +
-                "                              ,decode(gch.datatype, 53, 51, gch.datatype) datatype\n" +
-                "                              ,gch.userid\n" +
-                "                              ,gch.groutingdailydetailid\n" +
-                "                              ,gch.otherid\n" +
-                "                          FROM tp_pm_goodschangehistory gch\n" +
-                "                         WHERE gch.datatype IN (51, 52, 53)\n" +
-                "                        UNION ALL\n" +
-                "                        SELECT gch.goodscode\n" +
-                "                              ,gch.sapcode\n" +
-                "                              ,52 datatype\n" +
-                "                              ,gch.userid\n" +
-                "                              ,gch.groutingdailydetailid\n" +
-                "                              ,gch.goodsidafter\n" +
-                "                          FROM tp_pm_goodschangehistory gch\n" +
-                "                         WHERE gch.datatype = 53) gh\n" +
-                "                 INNER JOIN tp_mst_user u\n" +
-                "                    ON u.userid = gh.userid\n" +
-                "                 INNER JOIN tp_pm_groutingdailydetail bar\n" +
-                "                    ON bar.groutingdailydetailid = gh.groutingdailydetailid\n" + fifter +
-                "                 INNER JOIN tp_pc_groutingline gl\n" +
-                "                    ON gl.groutinglineid = bar.groutinglineid\n" +
-                "                 INNER JOIN tp_mst_goods g\n" +
-                "                    ON g.goodsid = bar.goodsid\n" +
+                "                  FROM tp_pm_groutingdailydetail bar\n" +
+                //"                 INNER JOIN tp_mst_user u\n" +
+                //"                    ON u.userid = gh.userid\n" +
+                "                 INNER JOIN tp_pm_finishedproduct gh\n" +
+                "                    ON bar.groutingdailydetailid = gh.groutingdailydetailid\n" +
+                //"                   AND bar.barcode IN (" + fifter + ")\n" +
+                //"                 INNER JOIN tp_pc_groutingline gl\n" +
+                //"                    ON gl.groutinglineid = bar.groutinglineid\n" +
+                //"                 INNER JOIN tp_mst_goods g\n" +
+                //"                    ON g.goodsid = bar.goodsid\n" +
                 "                  LEFT JOIN tp_pm_order o\n" +
-                "                    ON o.orderid = gh.otherid) t\n" +
+                "                    ON o.orderid = gh.fhorderid where 1=1 " + fifter + ") t\n" +
                 "         GROUP BY t.goodscode\n" +
                 "                 ,t.sapcode\n" +
                 "                 ,t.usercode\n" +

WCF.Service/WCF.Hosting/Config.ini

@@ -19,7 +19,7 @@ ServerName=Debug
 [VersionSetting]
 PublicClientVersion=1.0.0.6
 AndroidVersion=1.1.20.1109
-ClientVersion=1.1.20.1109
+ClientVersion=1.1.20.1125
 
 [PathSetting]
 ;客户端升级，下载文件路径

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -6334,7 +6334,24 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 				int returnValue = ServiceInvoker.Invoke<int>(this,
 				   () => PMModuleLogicDAL.SaveBarCodeLogo(barcode, logoid, sUserInfo));
 				actionResult.Result = JsonHelper.ToJson(returnValue);
-				actionResult.Status = (int)Constant.PDAResult.Success;
+				if (returnValue > 0)
+				{
+					actionResult.Status = (int)Constant.PDAResult.Success;
+				}
+				else if (returnValue == -2)
+				{
+					actionResult.Message = "条码不存在";
+					actionResult.Status = (int)Constant.PDAResult.Fail;
+				}
+				else if (returnValue == -3)
+				{
+					actionResult.Message = "已交接的产品不能变更商标";
+					actionResult.Status = (int)Constant.PDAResult.Fail;
+				}
+				else
+				{
+					actionResult.Status = (int)Constant.PDAResult.Fail;
+				}
 			}
 			catch (Exception ex)
 			{
@@ -6454,8 +6471,21 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 				   () => PMModuleLogic.GetBarCodeLogoID(barcode, sUserInfo));
 				if (returnValue != null && returnValue.Tables[0].Rows.Count > 0)
 				{
-					actionResult.Result = JsonHelper.ToJson(returnValue.Tables[0]);
-					actionResult.Status = (int)Constant.PDAResult.Success;
+					string err_msg = returnValue.Tables[0].Rows[0]["err_msg"] + "";
+					if (!string.IsNullOrWhiteSpace(err_msg))
+					{
+						actionResult.Status = (int)Constant.PDAResult.Fail;
+						actionResult.Message = err_msg;
+					}
+					else
+					{
+						actionResult.Result = JsonHelper.ToJson(returnValue.Tables[0]);
+						actionResult.Status = (int)Constant.PDAResult.Success;
+					}
+				}
+				else
+				{
+					actionResult.Status = (int)Constant.PDAResult.Fail;
 				}
 			}
 			catch (Exception ex)