1

wangyi

2025-11-27 7637114a28d16b399b09a7e84cac59514c0e1636

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

@@ -330,24 +330,24 @@
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate,HChecker,HCheckDate
                        ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
                        ,HOWNERID,HOWNERTYPEID)
                        ,HOWNERID,HOWNERTYPEID,HComboXSLX)
                        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].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].HOWNERTYPEID + "') ");
                "," + mainList[0].HOWNERID + ",'" + mainList[0].HOWNERTYPEID + "','" + mainList[0].HComboXSLX + "') ");
                //主表
                oCN.RunProc(@"Insert Into Sc_ICMOBillMain   
                        (HBillType,HInterID,HBillNo,HDate,HPRDORGID
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate,HChecker,HCheckDate
                        ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
                        ,HOWNERID,HOWNERTYPEID)
                        ,HOWNERID,HOWNERTYPEID,HComboXSLX)
                        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].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].HOWNERTYPEID + "') ");
                ","+ mainList[0].HOWNERID + ",'"+ mainList[0].HOWNERTYPEID + "','" + mainList[0].HComboXSLX + "') ");
                //保存主表
                foreach (var oSub in subList)
                {
@@ -1230,6 +1230,11 @@
                            err = "所选生产订单为已作废状态，不允许下推生成工序流转卡！\n";
                        }

                        if (ds.Tables[0].Rows[0]["状态"].ToString() != "下达" && ds.Tables[0].Rows[0]["状态"].ToString() != "开工")
                        {
                            err = "所选生产订单不为下达或开工状态，不允许下推生成工序流转卡！\n";
                        }

                        ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID + " and HSTOCKINORGID='" + OrganizationID + "'", "h_v_S_Sc_ICMOBillList");

                        if (double.Parse(ds.Tables[0].Rows[0]["流转卡数量"].ToString()) == 0)
@@ -1274,12 +1279,7 @@
                        lsmain.HPicNumAssemble = ds.Tables[0].Rows[0]["总装图号"].ToString();
                        lsmain.HMaterTexture = ds.Tables[0].Rows[0]["材质"].ToString();
                        lsmain.HProductNum = ds.Tables[0].Rows[0]["成品编号"].ToString();
                        lsmain.HVerNum = ds.Tables[0].Rows[0]["版本"].ToString();
                        //lsmain.HCusNumber = ds.Tables[0].Rows[0]["源单客户编码"].ToString();
                        //lsmain.HPickLabel = ds.Tables[0].Rows[0]["包装标识"].ToString();
                        //lsmain.HPickLabelNumber = ds.Tables[0].Rows[0]["包装标识编码"].ToString();
                        //lsmain.HXTNumber = ds.Tables[0].Rows[0]["芯体物料代码"].ToString();
                        //lsmain.HXTModel = ds.Tables[0].Rows[0]["芯体规格型号"].ToString();
                        lsmain.HVerNum = ds.Tables[0].Rows[0]["版本"].ToString();                    
                        lsmain.HWidth = double.Parse(ds.Tables[0].Rows[0]["HWidth"].ToString());
                        lsmain.HWeight = double.Parse(ds.Tables[0].Rows[0]["HWeight"].ToString());
                        lsmain.HAuxUnit = int.Parse(ds.Tables[0].Rows[0]["HAuxUnit"].ToString());
@@ -1311,6 +1311,8 @@
                                    ClsSc_ProcessExchangeBillSub sub = new ClsSc_ProcessExchangeBillSub();
                                    sub.HEntryID = j + 1;
                                    sub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                                    sub.HRoutingBillMainID = long.Parse(row["hmainid"].ToString());
                                    sub.HRoutingBillEntryID = long.Parse(row["hsubid"].ToString());
                                    sub.HProcNo = long.Parse(row["工序号"].ToString());
                                    sub.HProcID = long.Parse(row["HProcID"].ToString());
                                    sub.HProcNumber = row["工序代码"].ToString();
@@ -1349,7 +1351,7 @@
                    }
                    else
                    {
                        oBill.omodel.HBillNo = DBUtility.ClsPub.CreateBillCode("3772", ref DBUtility.ClsPub.sExeReturnInfo,true);
                        oBill.omodel.HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("3772", ref DBUtility.ClsPub.sExeReturnInfo,true);
                        bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                        oBill.DetailColl.Clear();