parent: a824b814 | 补丁 | 提交 | show whitespace
杨张扬
2025-05-28 150b2843db8bf76a35615aa46c17f59df1a0f0f4 
双钱-搬送流程记录班次字段
4个文件已修改
54 ■■■■■ 已修改文件
api/ApiHelper.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ApiModel.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
core/Monitor.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wms/LocationHelper.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 api/ApiHelper.cs


@@ -235,7 +235,8 @@


                                CARCODE = cG_Detail.S_CAR_CODE,


                                WEIGHT = cG_Detail.F_QTY,


                                REMELTTIME = DateTime.Now,


                                TASKNO = taskNo


                                TASKNO = taskNo,


                                SHIFT = model.shift,


                            };


                            SpecHelper.InsertRemeltDetail(target);


                        }


@@ -254,7 +255,7 @@


                                ITEMSTATE = cG_Detail.S_ITEM_STATE,


                                ITEMCODE = cG_Detail.S_ITEM_CODE,


                                LOGINNAME = model.staff,


                                SHIFT = "None",


                                SHIFT = model.shift,


                            };


                            SpecHelper.InsertInventoryM(target);


                        }


@@ -275,7 +276,7 @@


            catch (Exception ex)


            {


                result.resultCode = -1;


                result.resultMsg = $"发生了异常：{ex.Message}";


                result.resultMsg = $"PDA满托复检判断，发生了异常：{ex.Message}";


                LogHelper.Info(result.resultMsg);


                return result;


            }


@@ -413,7 +414,8 @@


                                SPEC = cgInfo.S_SPE,


                                CARCODE = cgInfo.S_CAR_CODE,


                                WEIGHT = cgInfo.F_QTY,


                                REMELTTIME = DateTime.Now


                                REMELTTIME = DateTime.Now,


                                SHIFT = model.shift,


                            };


                            SpecHelper.InsertRemeltDetail(target);


                        });


@@ -775,7 +777,7 @@


                                                    WEIGHT = modelWeight,


                                                    ITEMSTATE = "待检",


                                                    LOGINNAME = model.staff,


                                                    SHIFT = "None",


                                                    SHIFT = model.shift,


                                                    STARTLOC = startLoc.S_CODE,


                                                };


                                                SpecHelper.InsertEquipProDetail(target);


@@ -791,7 +793,7 @@


                                                    WEIGHT = modelWeight,


                                                    ITEMSTATE = "待检",


                                                    LOGINNAME = model.staff,


                                                    SHIFT = "None",


                                                    SHIFT = model.shift,


                                                };


                                                SpecHelper.InsertInventoryM(target);


                                            });


@@ -1026,6 +1028,7 @@


                           WEIGHT = cgInfo.F_QTY,


                           SPEC = model.Spe,


                           TASKNO = taskNo,


                           SHIFT = model.shift,


                        };


                        SpecHelper.InsertComponentDetail(target);


                    });


@@ -1277,7 +1280,8 @@


                            CARCODE = cG_Detail.S_CAR_CODE,


                            WEIGHT = cG_Detail.F_QTY,


                            REMELTTIME = DateTime.Now,


                            TASKNO = taksNo


                            TASKNO = taksNo,


                            SHIFT = model.shift,


                        };


                        SpecHelper.InsertSurplusDetail(target);


                    });


@@ -1293,7 +1297,7 @@


                            ITEMSTATE = cG_Detail.S_ITEM_STATE,


                            ITEMCODE = cG_Detail.S_ITEM_CODE,


                            LOGINNAME = model.staff,


                            SHIFT = "None",


                            SHIFT = model.shift,


                        };


                        SpecHelper.InsertInventoryM(target);


                    });


@@ -1677,7 +1681,8 @@


                                        SPEC = cG_old_Detail.S_SPE,


                                        CARCODE = cG_old_Detail.S_CAR_CODE,


                                        WEIGHT = cG_old_Detail.F_QTY,


                                        REMELTTIME = DateTime.Now


                                        REMELTTIME = DateTime.Now,


                                        SHIFT = model.shift,


                                    };


                                    SpecHelper.InsertRemeltDetail(target);


                                }


@@ -1693,7 +1698,8 @@


                                        SPEC = cG_new_Detail_Ins.S_SPE,


                                        CARCODE = cG_new_Detail_Ins.S_CAR_CODE,


                                        WEIGHT = cG_new_Detail_Ins.F_QTY,


                                        REMELTTIME = DateTime.Now


                                        REMELTTIME = DateTime.Now,


                                        SHIFT = model.shift,


                                    };


                                    SpecHelper.InsertRemeltDetail(target);


                                }


@@ -1712,7 +1718,7 @@


                                        ITEMSTATE = cG_old_Detail.S_ITEM_STATE,


                                        ITEMCODE = cG_old_Detail.S_ITEM_CODE,


                                        LOGINNAME = model.staff,


                                        SHIFT = "None",


                                        SHIFT = model.shift,


                                    };


                                    SpecHelper.InsertInventoryM(target);


                                }


@@ -1727,7 +1733,7 @@


                                        ITEMSTATE = cG_new_Detail_Ins.S_ITEM_STATE,


                                        ITEMCODE = cG_new_Detail_Ins.S_ITEM_CODE,


                                        LOGINNAME = model.staff,


                                        SHIFT = "None",


                                        SHIFT = model.shift,


                                    };


                                    SpecHelper.InsertInventoryM(target);


                                }


@@ -1801,10 +1807,12 @@


                


                if (startLocCnt == null)


                {


                    result.resultCode = 3;


                    result.resultMsg = $"起始位置{model.startLoc}未绑定容器";


                    LogHelper.Info(result.resultMsg);


                    return result;


                    startLocCnt = new TN_Loc_Container()


                    {


                        S_LOC_CODE = model.startLoc,


                        S_CNTR_CODE = Guid.NewGuid().ToString("D"),


                    };


                    db.Insertable<TN_Loc_Container>(startLocCnt).ExecuteCommand();


                }




                //创建点对点任务


@@ -1833,7 +1841,7 @@


                                ITEMSTATE = cginfo.S_ITEM_STATE,


                                ITEMCODE = cginfo.S_ITEM_CODE,


                                LOGINNAME = model.staff,


                                SHIFT = "None",


                                SHIFT = model.shift,


                            };


                            SpecHelper.InsertInventoryM(target);


                        }




 api/ApiModel.cs


@@ -399,6 +399,7 @@


            public string EndLoc { get; set; }//终点


            public string Spe { get; set; }//规格


            public string staff { get; set; } = "None";//操作人


            public string shift { get; set; } = "None";//班次


        }




        public class EmptyInStackAreaInfo


@@ -416,6 +417,7 @@


            public string cntID { get; set; }//容器ID




            public string staff { get; set; } = "None";//操作人


            public string shift { get; set; } = "None";//班次


        }




        public class SplitOutWarehouseInfo


@@ -434,6 +436,7 @@


            public string new_StartLoc { get; set; }//新容器ID起点


            public int new_IsOK { get; set; }//新容器ID的货品的0合格1不合格？


            public string staff { get; set; } = "None";//操作人


            public string shift { get; set; } = "None";//班次


        }




        public class UpCgDetailModel


@@ -450,6 +453,7 @@


            public string startLoc { get; set; }//起点


            public string endLoc { get; set; }//终点


            public string staff { get; set; } = "None";//操作人


            public string shift { get; set; } = "None";//班次


        }


    }


}




 core/Monitor.cs


@@ -467,7 +467,8 @@


                                    SPEC = outTimeCg.S_SPE,


                                    CARCODE = outTimeCg.S_CAR_CODE,


                                    WEIGHT = outTimeCg.F_QTY,


                                    REMELTTIME = DateTime.Now


                                    REMELTTIME = DateTime.Now,


                                    SHIFT = "None",


                                };


                                SpecHelper.InsertRemeltDetail(target);


                            });




 wms/LocationHelper.cs


@@ -565,6 +565,7 @@


        public string Spe { get; set; }//规格


        public string CarCode { get; set; }//车号


        public string staff { get; set; } = "None";//操作人


        public string shift { get; set; } = "None";//班次


    }




    public class ErrorLocCntResetInfo


@@ -584,6 +585,7 @@


        public int cgState { get; set; }//物料状态




        public string staff { get; set; } = "None";//操作人


        public string shift { get; set; } = "None";//班次


    }




    public class ShowCntCountBySpeInfo


@@ -597,9 +599,8 @@


    public class PDAReturnResetInfo


    {


        public string rfId { get; set; }//容器号




        public string startLoc { get; set; }//起点货位




        public string staff { get; set; } = "None";//操作人


        public string shift { get; set; } = "None";//班次


    }


}