修改了快速生成条码模块条码生成方法

ch

2022-08-09 bb09b08f7ae3dd528f47d6c860e2a0abef7e6a6b

修改了快速生成条码模块条码生成方法

 Kanban/Sc_CJKB.cs

@@ -101,15 +101,16 @@
                //-----------预警状态
                //开工时间小于当天时间，但是任务单状态还是 å¾…生产，系统自动黄色警示；
                //完工时间小于当天时间，但是任务单还是待生产或者在执行的，系统自动红色警示；
                int HEDateCol = Fun_GetCol("计划完工日期");
                DateTime oNow = DateTime.Today.Date;
                for (int i = 0; i < grdMain.Rows.Count; i++)
                {
                    if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
                    {
                        grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
                    }
                }

                //int HEDateCol = Fun_GetCol("计划完工日期");
                //DateTime oNow = DateTime.Today.Date;
                //for (int i = 0; i < grdMain.Rows.Count; i++)
                //{
                //    if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
                //    {
                //        grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
                //    }
                //}

                //设置合计列
                string sTotalCol = "";

 LMES/bin/x86/Debug.zip

Binary files differ

 NETERPNoWin/bin/x86/Debug.zip

Binary files differ

 NETERPNoWin/bin/x86/Debug/BLL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BLL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/HXERP.ini

@@ -1,46 +1,25 @@
[po]
Server=47.96.97.237,15127
[Erp]
Server=47.96.97.237,15127
Server=192.168.0.88
DataBase=HX_LMESsys
DataBaseNumber=001-智云LMES管理系统
DataBaseNumber=001-WMS条码系统
UserName=HX_USER
PassWord=lc@841022
UserPsd=
Remember=
[Srm]
Server=47.96.97.237,15127
DataBase=HX_LMESsys
DataBaseNumber=001-ERP供应商协同平台
UserName=HX_USER
PassWord=lc@841022
UserPsd=
Remember=
[K3Erp]
Server=47.96.97.237,15127
DataBase=
UserName=HX_USER
PassWord=lc@841022
[K32Erp]
Server=47.96.97.237,15127
Server=192.168.0.88
DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[UserInfo]
UserName=admin,33.995,001,宁波海关驻慈溪办事处,景焕章
UserName=admin,王平,测试人员,jhz,001,景焕章,周黄阳,没有找到！
UserPsd=
Remember=1
HOrgName=蓝海实业集团
[CLOUDINFO]

sCLOUDUrl=http://47.96.97.237/k3cloud/
sCLOUDAcc=6204a70eba35fc
sCLOUDUseName=demo
sCLOUDPsd=888888
HOrgName=宁波奥邦喷雾器有限公司
[K32Erp]
Server=没有找到！
DataBase=没有找到！
UserName=没有找到！
PassWord=没有找到！
[OPenWin]
gnbm=Sc9910
gnsy=Sc_WorkBillPlanSumReportKB
gnmc=车间看板
[Dept]
DeptID=没有找到！
DeptName=没有找到！
gnmc=车间看板

 NETERPNoWin/bin/x86/Debug/HX_Update.exe

Binary files differ

 NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/grdWidth.wyini

@@ -54,4 +54,4 @@
Sc_WorkBillProcProdReportKB=193,556,523,112
Sc_HZQLCGKB=11,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100
frmDownMenu任务单设置=100,135,100
Sc_CJKB=
Sc_CJKB=100,428,301,100,273,372

 NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb

Binary files differ

 WarM/ÌõÂë´òÓ¡/Sc_ICMOToBarCode.cs

@@ -875,17 +875,32 @@
                long HTMaterID = 0;
                HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
                string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //外箱码 å‰ç¼€


                //获取处理过的日期跟今天差几天  ç„¶åŽåŠ å‡ ä¸ª+号
                TimeSpan HCY = Convert.ToDateTime(HPrdDate) - Convert.ToDateTime(DateTime.Now.ToString());
                int a = 1;
                while (a <= HCY.Days)  //当a å°äºŽ å·®å¼‚天数  å¾ªçŽ¯åŠ ä¸Š + å·
                {
                    HPrdDate = HPrdDate + "+";
                    a = a + 1;
                }
                DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号                                                                                          //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
                Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
                DataSet DSet3 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate1.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
                if (DSet3 == null || DSet3.Tables[0].Rows.Count == 0)
                {
                    sPackBarCode = sPackStr + TTM_LSH.ToString() ;
                }
                else
                {
                    sPackBarCode = sPackStr + TTM_LSH.ToString() + "+";
                }


                sPackBarCode = sPackStr + TTM_LSH.ToString();
                //DataSet DSet3 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate1.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
                //if (DSet3 == null || DSet3.Tables[0].Rows.Count == 0)
                //{
                //    sPackBarCode = sPackStr + TTM_LSH.ToString() ;
                //}
                //else
                //{
                //    sPackBarCode = sPackStr + TTM_LSH.ToString() + "+";
                //}


                oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");


@@ -978,7 +993,7 @@
                        HJT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("设备")].Value);
                        HXH = HYear + HPeriod + HDay + HBC + HJT + HMaterNumber;
                        Ds99 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HXH + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                        LSH3 = ClsPub.isInt(Ds99.Tables[0].Rows[0][0]);
                        LSH3 = ClsPub.isInt(Ds99.Tables[0].Rows[0][0]) + 1;
                        LSH4 = LSH3.ToString();



 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -18,28 +18,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>07/31/2022 16:05:34</publishTime>
      <publishTime>08/08/2022 14:58:19</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>07/31/2022 16:05:34</publishTime>
      <publishTime>08/08/2022 14:58:19</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>07/31/2022 16:05:32</publishTime>
      <publishTime>08/08/2022 14:58:18</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>07/31/2022 16:05:32</publishTime>
      <publishTime>08/08/2022 14:58:18</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>07/31/2022 16:05:26</publishTime>
      <publishTime>08/08/2022 14:58:16</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>07/31/2022 16:05:26</publishTime>
      <publishTime>08/08/2022 14:58:16</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,10 +93,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>07/31/2022 16:05:28</publishTime>
      <publishTime>08/08/2022 14:58:17</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>07/31/2022 16:05:28</publishTime>
      <publishTime>08/08/2022 14:58:17</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>03/15/2022 10:06:42</publishTime>
@@ -129,22 +129,22 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>07/31/2022 16:05:24</publishTime>
      <publishTime>08/08/2022 14:58:15</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>07/31/2022 16:05:24</publishTime>
      <publishTime>08/08/2022 14:58:15</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>07/31/2022 16:05:25</publishTime>
      <publishTime>08/08/2022 14:58:15</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>07/31/2022 16:05:25</publishTime>
      <publishTime>08/08/2022 14:58:15</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>07/31/2022 16:05:25</publishTime>
      <publishTime>08/08/2022 14:58:15</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>07/31/2022 16:05:25</publishTime>
      <publishTime>08/08/2022 14:58:15</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -255,13 +255,13 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/31/2022 16:05:39</publishTime>
      <publishTime>08/08/2022 14:58:22</publishTime>
    </File>
    <File Include="bin/WebAPI.dll.config">
      <publishTime>12/15/2021 17:59:43</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/31/2022 16:05:39</publishTime>
      <publishTime>08/08/2022 14:58:22</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -459,7 +459,7 @@
      <publishTime>12/20/2021 13:19:56</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/31/2022 16:05:46</publishTime>
      <publishTime>08/08/2022 14:58:31</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj.user

@@ -9,7 +9,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>false</UseIISExpress>
    <Use64BitIISExpress />