条码生成加字段（操作员，班组）；同步生产汇报单到金蝶修改源单类型；日计划子表数量字段转换；

yusijie

2024-06-19 89794419b10c5a70afc6a7156cfc32e2aedafef7

条码生成加字段（操作员，班组）；同步生产汇报单到金蝶修改源单类型；日计划子表数量字段转换；

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -430,7 +430,7 @@
                oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
                    "HMasterDate,HQty,HUseTimes)" +
                            $"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
                            $" '{date}', {HQTY},{(dic["小时产能"] == "0.0000" ? 0 : HQTY / float.Parse(dic["小时产能"].ToString()))})");               
                            $" '{date}', {HQTY},{ ( (dic["小时产能"] == "0.0000" ? 0 : HQTY / float.Parse(dic["小时产能"].ToString())).ToString()=="非数字" ? 0 : dic["小时产能"] == "0.0000" ? 0 : HQTY / float.Parse(dic["小时产能"].ToString())) })");               
            }

            objJsonResult.code = "1";

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs

@@ -819,6 +819,9 @@
            decimal HAuxQty = 0;
            string HheatNO = "";

            Int64 HGroupID = 0;
            long HEmpID = 0;

            DataSet Ds;
            msg2 = msg2.Replace("\\", "");
            msg2 = msg2.Replace("\n", "");  //\n
@@ -837,6 +840,8 @@
                    HFactory = ClsPub.isStrNull(ordrlist[j].HFactory);
                    HAuxQty = ClsPub.isLong(ordrlist[j].HAuxQty);
                    HheatNO = ClsPub.isStrNull(ordrlist[j].HheatNO);
                    HGroupID = ClsPub.isInt(ordrlist[j].HGroupID);
                    HEmpID = ClsPub.isLong(ordrlist[j].HEmpID);
                    //日期获取方式
                    sDate = DateTime.Now.ToString();
                    //
@@ -1183,6 +1188,9 @@
                        barcode.HFactory = ordrlist[j].HFactory;
                        barcode.HAuxQty = ordrlist[j].HAuxQty;
                        barcode.HheatNO = ordrlist[j].HheatNO;

                        barcode.HGroupID2 = ordrlist[j].HGroupID;
                        barcode.HEmpID2 = ordrlist[j].HEmpID;
                        ListRows.Add(barcode);
                        k = k + 1;
                        n = n + 1;
@@ -1199,7 +1207,7 @@
            double HQty2 = 0;
            string HBatchNo2 = "";
            Int64 HSupID = 0;
            Int64 HGroupID = 0;
            Int64 HGroupID2 = 0;
            int HPrintQty = 0;
            Int64 HSourceInterID = 0;
            Int64 HSourceEntryID = 0;
@@ -1231,6 +1239,8 @@
            string HheatNO2 = "";
            DateTime HProduceDate;
            DateTime HExpiryDate;
            long HEmpID2 = 0;

            try
            {
                oCN.BeginTran();
@@ -1283,6 +1293,8 @@
                        HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO);
                        HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate);
                        HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate);
                        HGroupID2 = ClsPub.isInt(ListRows[i].HGroupID2);
                        HEmpID2 = ClsPub.isLong(ListRows[i].HEmpID2);
                        oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -1291,16 +1303,16 @@
                                    ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
                                    ",HGiveAwayFlag " +
                                    ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
                                    ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate " +
                                    ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID " +
                                    ") values ("
                                    + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                                    + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
                                    + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
                                    + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
                                    + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
                                    + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
                                    + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
                                    + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
                                    + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'" + ")");
                                    + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ")");


                        //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);

 WebAPI/DLL/ClsSc_ICMOReportBill.cs

@@ -460,7 +460,7 @@
                        FentityModel.Add("FMTONO", item["FMTONO"].ToString());//   è®¡åˆ’跟踪号
                        FentityModel.Add("FCheckProduct", item["FCheckProduct"].ToString());//   äº§å“æ£€éªŒ
                        FentityModel.Add("FISENTRUST", item["FISENTRUST"].ToString());//       ç»„织委托加工
                        FentityModel.Add("FSrcBillType", "FSRCBILLTYPE");//   æºå•ç±»åž‹
                        FentityModel.Add("FSrcBillType", item["FSRCBILLTYPE"].ToString());//   æºå•ç±»åž‹
                        FentityModel.Add("FMOBILLNO", item["FMOBILLNO"].ToString());//  ç”Ÿäº§è®¢å•
                        FentityModel.Add("FSrcBillNo", item["FSrcBillNo"].ToString());//   æºå•ç¼–号
                        FentityModel.Add("FMoEntrySeq", item["FMoEntrySeq"].ToString());//生产订单行号

 WebAPI/Models/HBarCodeList.cs

@@ -71,5 +71,7 @@
        public DateTime HProduceDate { get; set; } //"生产日期";
        public DateTime HExpiryDate { get; set; } //"保质期至";

        public Int64 HGroupID2 { get; set; } //"班组";
        public Int64 HEmpID2 { get; set; } //"操作员";
    }
}

 WebAPI/Models/HSouceOrderList.cs

@@ -70,5 +70,11 @@
        public string HFactory { get; set; } //"厂商";
        public DateTime HProduceDate { get; set; } //"生产日期";
        public DateTime HExpiryDate { get; set; } //"保质期至";
        public Int64 HGroupID { get; set; } //"班组";
        public string HGroupNumber { get; set; } //"班组";
        public string HGroupName { get; set; } //"班组";
        public Int64 HEmpID { get; set; } //"操作员";
        public string HEmpNumber { get; set; } //"操作员";
        public string HEmpName { get; set; } //"操作员";
    }
}