流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量...

yangle

2023-05-16 a1709bcc95fe641126f5c34e0a344e406b467f88

流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量显示。生产订单模块增加一个字段，是否取库存,底部备注，做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂（第一道和第二道）（把以前所有的流水号加20，在把白坯定型（10），和染厂（20）刷进去

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSc_ICMOBillMain.cs

@@ -25,6 +25,7 @@
        public string HBomNumber;              
        public Int64 HRoutingInterID;     //    --工艺路线ID
        public Int64 HOWNERID;     //    --货主
        public string HOWNERTYPEID;     //    --货主类型
        public DateTime HPlanBeginDate;      //计划开工日期
        public DateTime HPlanEndDate;        //计划完工日期
        public DateTime HBeginDate;    // --最迟开工日期         
@@ -33,6 +34,8 @@
        public double HReadyQty;     //      --齐套数量         
        public double? HPlanQty;        //计划生产数量
        public string HRemark;
        public string HIsStockQty;//是否取库存
        public string HRemark3;//底部备注

        public double HRelationQty;
        public string HOrderProcNo;//订单跟踪号

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1657,6 +1657,31 @@
                    {
                        omodel.BarCode_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //-==================生产订单
                    //生产订单同步时自动生成流转卡
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_AutoProcExchBill")
                    {
                        omodel.Sc_ICMOBill_AutoProcExchBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_DeleterAndMakerMustSame")
                    {
                        omodel.Sc_ICMOBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    //-==================工序流转卡
                    //工序流转卡保存自动同步条码档案
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_AutoBarCode")
                    {
                        omodel.Sc_ProcessExchangeBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_DeleterAndMakerMustSame")
                    {
                        omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    ////=========工序进站单
                    ////自动匹配流水号
                    //if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNo")

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -192,7 +192,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！物料属性不能为空！";
                        objJsonResult.Message = "保存失败！物料分类不能为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -124,6 +124,7 @@
                long HCenterID = list[0].HCenterID;//工作中心ID
                string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                long HPRDOrgID = list[0].HPRDOrgID;//组织ID
                double HmaterOutqty = list[0].HmaterOutqty;//白坯发布
                //单据完整性判断
                if (HMaterID <= 0)
                {
@@ -191,6 +192,7 @@
                    ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
                    ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
                    ",HProcNo,HOrderProcNO,HMainInterID,HPRDOrgID" +
                    ",HmaterOutqty" +
                    ") " +
                    " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
                    "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
@@ -199,7 +201,7 @@
                    "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
                    "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
                    ",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
                    ") ");
                    ","+ HmaterOutqty + ") ");
                }
                else if ("Modify".Equals(eventType))
                {
@@ -227,6 +229,7 @@
                    ",HProcExchBillNo='" + HProcExchBillNo + "'" +
                    ",HMaterID=" + HMaterID +
                    ",HProcID=" + HProcID +
                    ",HmaterOutqty=" + HmaterOutqty +
                    ",HICMOQty=" + HICMOQty +
                    ",HPlanQty=" + HPlanQty +
                    ",HStationInTime=getdate()" +

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -18,6 +18,7 @@
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        #region[新增单据-保存按钮]
        /// <summary>
@@ -816,7 +817,6 @@
                return objJsonResult;
            }


            Int64 lngBillKey = 0;
            lngBillKey = DBUtility.ClsPub.isLong(HInterID);
            if (lngBillKey == 0)
@@ -827,7 +827,6 @@
                objJsonResult.data = null;
                return objJsonResult;
            }


            //删除前判断关联数量
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -850,6 +849,23 @@
            DBUtility.ClsPub.HOrgID = HPRDORGID;
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn))
                {
                    if (oSystemParameter.omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame == "Y")
                    {
                        if (oBill.omodel.HMaker != user)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "只能删除本人的单据！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }


                if (oBill.omodel.HBillStatus > 1)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MaterTypeBillController.cs

@@ -518,7 +518,7 @@
                    if (strLen.Length == num && dt.Rows[i]["hnumber"].ToString().Contains(tree[m].id + "."))
                    {
                        TreeModel tbjson = new TreeModel();
                        tbjson.id = dt.Rows[i]["hnumber"].ToString();
                        tbjson.id = dt.Rows[i]["hitemid"].ToString();
                        tbjson.title = dt.Rows[i]["hname"].ToString();
                        tree[m].children.Add(tbjson);
                    }

 WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs

@@ -288,12 +288,12 @@
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate
                        ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
                        ,HOWNERID)
                        ,HOWNERID,HOWNERTYPEID)
                        values('3710'," + mainList[0].HInterID + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'," + mainList[0].HPRDORGID +
                "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker + "',getdate()" +
                ",'" + mainList[0].HSeOrderBillNo + "'," + mainList[0].HSeOrderInterID + "," + mainList[0].HSeOrderEntryID + "," + mainList[0].HEmpID + "," + mainList[0].HCusID +
                "," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2" +
                ","+ mainList[0].HOWNERID + ") ");
                ","+ mainList[0].HOWNERID + ",'"+ mainList[0].HOWNERTYPEID + "') ");
                //保存主表
                foreach (var oSub in subList)
                {
@@ -442,6 +442,8 @@
                long HBomID = mainList[0].HBomID;//bom
                //double? HPlanQty = mainList[0].HPlanQty == null ? 0 : mainList[0].HPlanQty;//计划数量
                string HMaker = user;//制单人
                string HIsStockQty = mainList[0].HIsStockQty;
                string HRemark3 = mainList[0].HRemark3;

                ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where hmainid=" + HInterID + " and å•æ®å·='" + HBillNo + "'", "h_v_IF_ICMOBillList");

@@ -452,11 +454,13 @@
                        (HBillType,HBillStatus,HInterID,HBillNo,HDate,HPRDORGID
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate
                        ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate)
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate
                        ,HIsStockQty,HRemark3)
                        values('3710',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
                    "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                    ",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
                    "," + HCenterID + ",0,0,0,0," + HBomID + ",'','') ");
                    "," + HCenterID + ",0,0,0,0," + HBomID + ",'',''" +
                    ",'"+ HIsStockQty + "','"+ HRemark3 + "') ");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                {
@@ -472,8 +476,8 @@
                    //修改
                    oCN.RunProc("update Sc_ICMOBillMain  set " +
                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                ", HSeOrderBillNo='" + HSeOrderBillNo + "', HSeOrderInterID=" + HSeOrderInterID + ", HSeOrderEntryID=" + HSeOrderEntryID + ", HEmpID=" + HEmpID + ", HCusID=" + HCusID + "" +
                                ", HCenterID=" + HCenterID + ",HBomID=" + HBomID + " where HInterID=" + HInterID);
                                ", HSeOrderBillNo='" + HSeOrderBillNo + "', HSeOrderInterID=" + HSeOrderInterID + ", HSeOrderEntryID=" + HSeOrderEntryID + ", HEmpID=" + HEmpID + ", HCusID=" + HCusID +
                                ", HCenterID=" + HCenterID + ",HBomID=" + HBomID + ",HIsStockQty='"+ HIsStockQty + "',HRemark3='" + HRemark3 + "' where HInterID=" + HInterID);

                    //删除子表
                    oCN.RunProc("delete from Sc_ICMOBillSub where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'");
@@ -845,6 +849,24 @@
                    return objJsonResult; ;
                }

                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn))
                {
                    if (oSystemParameter.omodel.Sc_ICMOBill_DeleterAndMakerMustSame == "Y")
                    {
                        if (ds.Tables[0].Rows[0]["HMaker"].ToString() != user)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "只能删除本人的单据！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }



                if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
                {
                    objJsonResult.code = "0";