WMSPrjInstance/HH-0121_DuShanZiShiHua.git

			@@ -22,8 +22,10 @@
			/// </summary>
			/// <param name="code"></param>
			/// <param name="message"></param>
			/// <param name="log"></param>
			/// <returns></returns>
			public static SimpleResult NewSimpleResult(int code, string message) {
			public static SimpleResult NewSimpleResult(int code, string message, bool log = true) {
			if (log) { LogHelper.Info(message); }
			return new SimpleResult { resultCode = code, resultMsg = message };
			}

			@@ -77,7 +79,8 @@
			public string ResultMsg { get; set; }
			}

			public static ReturnResult NewReturnResult(int code, string message) {
			public static ReturnResult NewReturnResult(int code, string message, bool log = true) {
			if (log) { LogHelper.Info(message); }
			return new ReturnResult { ResultCode = code, ResultMsg = message };
			}

			@@ -150,7 +153,7 @@

			public class OtherModel {
			/// <summary>
			/// 好运箱-满箱下线入库(PDA)数据类
			/// 满箱下线入库
			/// </summary>
			public class GoodpackOfflineInfo {
			/// <summary>
			@@ -206,7 +209,7 @@
			public string StartLoc { get; set; }
			}
			/// <summary>
			/// 空箱上线信息
			/// 空托上线信息
			/// </summary>
			public class EmptyOnlinePalletInfo {
			/// <summary>
			@@ -260,7 +263,17 @@
			/// <summary>
			/// 不合格移库数据类
			/// </summary>
			public class UnqualifiedShiftInfo : QualifiedBackInfo {
			public class UnqualifiedShiftInfo {
			/// <summary>
			/// 物料编码
			/// </summary>
			[JsonProperty("item_code")]
			public string ItemCode { get; set; }
			/// <summary>
			/// 容器编码
			/// </summary>
			[JsonProperty("cntr_code")]
			public string CntrCode { get; set; }
			/// <summary>
			/// 不合格移库终点库区（必须是 CJYCQ 抽检异常区）
			/// </summary>
			@@ -359,6 +372,11 @@
			/// </summary>
			[JsonProperty("cntrCode")]
			public string CntrCode { get; set; }
			/// <summary>
			/// 物料数量（待定）
			/// </summary>
			[JsonProperty("itemNum")]
			public int ItemNum { get; set; }
			///// <summary>
			///// 产线号（待定，好运箱有2条产线，对应2个下线货位，这里暂定为：3和4）
			///// </summary>
			@@ -389,7 +407,15 @@
			public string Data { get; set; }
			}

			public static MesResult NewMesResult(int code, string message = "", bool printLog = true) {
			/// <summary>
			/// 仅当 Code = 0 表示成功
			/// </summary>
			/// <param name="code"></param>
			/// <param name="message"></param>
			/// <param name="log"></param>
			/// <returns></returns>
			public static MesResult NewMesResult(int code, string message = "", bool log = true) {
			if (log) { LogHelper.Info(message); }
			return new MesResult {
			Result = code,
			Success = code == 0, // 仅当code=0时，success=true
			@@ -407,56 +433,798 @@
			public string Message { get; set; }
			}

			public static ErpResult NewErpResult(int code, string message) {
			public static ErpResult NewErpResult(int code, string message, bool log = true) {
			if (log) { LogHelper.Info(message); }
			return new ErpResult { Code = code, Message = message };
			}

			/// <summary>
			/// ERP 下发出库任务的数据类型
			/// </summary>
			public class ErpSendOutboundOrderInfo {
			public string ErpNo { get; set; } // ERP 单号
			public class ErpSendOutboundPlanInfo {
			/// <summary>
			/// 物料编码
			/// 计划单号（唯一标识）
			/// </summary>
			[JsonProperty("item_code")]
			public string ItemCode { get; set; }
			/// <summary>
			/// 物料规格
			/// </summary>
			[JsonProperty("spe")]
			public string Spe { get; set; }
			/// <summary>
			/// 批次号
			/// </summary>
			[JsonProperty("batch_no")]
			public string BatchNo { get; set; }
			/// <summary>
			/// 需出库数量
			/// </summary>
			[JsonProperty("qty")]
			public int Qty { get; set; }
			/// <summary>
			/// 容器类型
			/// </summary>
			[JsonProperty("cntr_type")]
			public string CntrType { get; set; }
			/// <summary>
			/// 出库终点货区
			/// </summary>
			[JsonProperty("end_area")]
			public string EndArea { get; set; }
			/// <summary>
			/// 是否强制出库
			/// </summary>
			[JsonProperty("force_out")]
			public bool ForcedOut { get; set; }
			public string jhdh { get; set; } = string.Empty;

			/// <summary>
			/// 出库状态
			/// </summary>
			public string ckzt { get; set; } = string.Empty;// 需要返回

			/// <summary>
			/// 计划类别
			/// </summary>
			public string jhlb { get; set; } = string.Empty;

			/// <summary>
			/// 参考单号
			/// </summary>
			public string ckdh { get; set; } = string.Empty;

			/// <summary>
			/// 车牌号
			/// </summary>
			public string cph { get; set; } = string.Empty;

			/// <summary>
			/// 运输方式
			/// </summary>
			public string ysfs { get; set; } = string.Empty;

			/// <summary>
			/// 产品状态
			/// </summary>
			public string cpzt { get; set; } = string.Empty;

			/// <summary>
			/// 买断单位
			/// </summary>
			public string mddw { get; set; } = string.Empty;

			/// <summary>
			/// 产品代码
			/// </summary>
			public string cpdm { get; set; } = string.Empty;

			/// <summary>
			/// 产品类别
			/// </summary>
			public string cplb { get; set; } = string.Empty;

			/// <summary>
			/// 产品类别明细
			/// </summary>
			public string cplbmx { get; set; } = string.Empty;

			/// <summary>
			/// 品牌
			/// </summary>
			public string pp { get; set; } = string.Empty;

			/// <summary>
			/// 等级
			/// </summary>
			public string dj { get; set; } = string.Empty;// 需要返回

			/// <summary>
			/// 罐号
			/// </summary>
			public string gh { get; set; } = string.Empty;

			/// <summary>
			/// 批号
			/// </summary>
			public string ph { get; set; } = string.Empty;// 需要返回

			/// <summary>
			/// 包装类型
			/// </summary>
			public string bzlx { get; set; } = string.Empty;

			/// <summary>
			/// 派装单号
			/// </summary>
			public string pzdh { get; set; } = string.Empty;

			/// <summary>
			/// 派装单单位
			/// </summary>
			public string pzd_dw { get; set; } = string.Empty;

			/// <summary>
			/// 派装单调运编号
			/// </summary>
			public string pzd_dybh { get; set; } = string.Empty;

			/// <summary>
			/// 派装件数
			/// </summary>
			public double pzjs { get; set; } = 0;

			/// <summary>
			/// 派装数量
			/// </summary>
			public decimal pzsl { get; set; } = 0;

			/// <summary>
			/// 派装日期(yyyy-mm-dd)
			/// </summary>
			public string pz_rq { get; set; } = string.Empty;

			/// <summary>
			/// 派装操作日期
			/// </summary>
			public long pz_czrq { get; set; } = 0;

			/// <summary>
			/// 派装作废标记
			/// </summary>
			public int pz_zfbj { get; set; } = 0;

			/// <summary>
			/// 派装作废日期
			/// </summary>
			public long pz_zfrq { get; set; } = 0;

			/// <summary>
			/// 派装备注
			/// </summary>
			public string pz_bz { get; set; } = string.Empty;

			/// <summary>
			/// 出库单编号
			/// </summary>
			public string ckdbh { get; set; } = string.Empty;

			/// <summary>
			/// 实发件数
			/// </summary>
			public double sfjs { get; set; } = 0; // 需要返回

			/// <summary>
			/// 实发数量
			/// </summary>
			public decimal sfsl { get; set; } = 0; // 需要返回

			/// <summary>
			/// 实发车数
			/// </summary>
			public int sfcs { get; set; } = 0; // 需要返回

			/// <summary>
			/// 装车时间
			/// </summary>
			public string zcsj { get; set; } = string.Empty; // 需要返回

			/// <summary>
			/// 计量单位
			/// </summary>
			public string jldw { get; set; } = string.Empty;// 需要返回

			/// <summary>
			/// 发货日期
			/// </summary>
			public long fhrq { get; set; } = 0; // 需要返回

			/// <summary>
			/// 仓库代码
			/// </summary>
			public string ckdm { get; set; } = string.Empty; // 需要返回

			/// <summary>
			/// 发货人
			/// </summary>
			public string fhr { get; set; } = string.Empty; // 需要返回

			/// <summary>
			/// 操作员
			/// </summary>
			public string czydm { get; set; } = string.Empty; // 需要返回

			/// <summary>
			/// 审核人
			/// </summary>
			public string shr_username { get; set; } = string.Empty;

			/// <summary>
			/// 审核日期
			/// </summary>
			public long shrq { get; set; } = 0;

			/// <summary>
			/// 作废标记
			/// </summary>
			public long zfbj { get; set; } = 0;

			/// <summary>
			/// 作废日期
			/// </summary>
			public long zfrq { get; set; } = 0;

			/// <summary>
			/// 结算单位
			/// </summary>
			public string jsdw { get; set; } = string.Empty;

			/// <summary>
			/// 收货单位
			/// </summary>
			public string shdw { get; set; } = string.Empty;

			/// <summary>
			/// 运输单位
			/// </summary>
			public string ysdw { get; set; } = string.Empty;

			/// <summary>
			/// 联系人
			/// </summary>
			public string lxr { get; set; } = string.Empty;

			/// <summary>
			/// 装卸工
			/// </summary>
			public string ry_zxg { get; set; } = string.Empty; // 需要返回

			/// <summary>
			/// 叉车司机
			/// </summary>
			public string ry_ccsj { get; set; } = string.Empty; // 需要返回

			/// <summary>
			/// erp交货单号
			/// </summary>
			public string erphx_jhdh { get; set; } = string.Empty;

			/// <summary>
			/// erp物料编码
			/// </summary>
			public string erphx_wlbm { get; set; } = string.Empty;

			/// <summary>
			/// erp物料名称
			/// </summary>
			public string erphx_wlmc { get; set; } = string.Empty;

			/// <summary>
			/// erp创建日期
			/// </summary>
			public string erphx_cjrq { get; set; } = string.Empty;

			/// <summary>
			/// 货位
			/// </summary>
			public string hw { get; set; } = string.Empty; // 需要返回

			/// <summary>
			/// 货位状态
			/// </summary>
			public string hwzt { get; set; } = string.Empty; // 需要返回
			}

			public class PickUpReturnErpInfo {
			public string LocCode { get; set; }
			/// <summary>
			/// 计划单号（唯一标识）
			/// </summary>
			public string jhdh { get; set; }

			/// <summary>
			/// 出库状态
			/// </summary>
			public string ckzt { get; set; } // 需要返回

			/// <summary>
			/// 计划类别
			/// </summary>
			public string jhlb { get; set; }

			/// <summary>
			/// 参考单号
			/// </summary>
			public string ckdh { get; set; }

			/// <summary>
			/// 车牌号
			/// </summary>
			public string cph { get; set; }

			/// <summary>
			/// 运输方式
			/// </summary>
			public string ysfs { get; set; }

			/// <summary>
			/// 产品状态
			/// </summary>
			public string cpzt { get; set; }

			/// <summary>
			/// 买断单位
			/// </summary>
			public string mddw { get; set; }

			/// <summary>
			/// 产品代码
			/// </summary>
			public string cpdm { get; set; }

			/// <summary>
			/// 产品类别
			/// </summary>
			public string cplb { get; set; }

			/// <summary>
			/// 产品类别明细
			/// </summary>
			public string cplbmx { get; set; }

			/// <summary>
			/// 品牌
			/// </summary>
			public string pp { get; set; }

			/// <summary>
			/// 等级
			/// </summary>
			public string dj { get; set; } // 需要返回

			/// <summary>
			/// 罐号
			/// </summary>
			public string gh { get; set; }

			/// <summary>
			/// 批号
			/// </summary>
			public string ph { get; set; } // 需要返回

			/// <summary>
			/// 包装类型
			/// </summary>
			public string bzlx { get; set; }

			/// <summary>
			/// 派装单号
			/// </summary>
			public string pzdh { get; set; }

			/// <summary>
			/// 派装单单位
			/// </summary>
			public string pzd_dw { get; set; }

			/// <summary>
			/// 派装单调运编号
			/// </summary>
			public string pzd_dybh { get; set; }

			/// <summary>
			/// 派装件数
			/// </summary>
			public double pzjs { get; set; }

			/// <summary>
			/// 派装数量
			/// </summary>
			public decimal pzsl { get; set; }

			/// <summary>
			/// 派装日期(yyyy-mm-dd)
			/// </summary>
			public string pz_rq { get; set; }

			/// <summary>
			/// 派装操作日期
			/// </summary>
			public long pz_czrq { get; set; }

			/// <summary>
			/// 派装作废标记
			/// </summary>
			public int pz_zfbj { get; set; }

			/// <summary>
			/// 派装作废日期
			/// </summary>
			public long pz_zfrq { get; set; }

			/// <summary>
			/// 派装备注
			/// </summary>
			public string pz_bz { get; set; }

			/// <summary>
			/// 出库单编号
			/// </summary>
			public string ckdbh { get; set; }

			/// <summary>
			/// 实发件数
			/// </summary>
			public double sfjs { get; set; } // 需要返回

			/// <summary>
			/// 实发数量
			/// </summary>
			public decimal sfsl { get; set; } // 需要返回

			///// <summary>
			///// 实发车数
			///// </summary>
			//public int sfcs { get; set; } // 需要返回

			///// <summary>
			///// 装车时间
			///// </summary>
			//public string zcsj { get; set; } // 需要返回

			///// <summary>
			///// 计量单位
			///// </summary>
			//public string jldw { get; set; } // 需要返回

			///// <summary>
			///// 发货日期
			///// </summary>
			//public long fhrq { get; set; } // 需要返回

			///// <summary>
			///// 仓库代码
			///// </summary>
			//public string ckdm { get; set; } // 需要返回

			///// <summary>
			///// 发货人
			///// </summary>
			//public string fhr { get; set; } // 需要返回

			///// <summary>
			///// 操作员
			///// </summary>
			//public string czydm { get; set; } // 需要返回

			/// <summary>
			/// 审核人
			/// </summary>
			public string shr_username { get; set; }

			/// <summary>
			/// 审核日期
			/// </summary>
			public long shrq { get; set; }

			/// <summary>
			/// 作废标记
			/// </summary>
			public long zfbj { get; set; }

			/// <summary>
			/// 作废日期
			/// </summary>
			public long zfrq { get; set; }

			/// <summary>
			/// 结算单位
			/// </summary>
			public string jsdw { get; set; }

			/// <summary>
			/// 收货单位
			/// </summary>
			public string shdw { get; set; }

			/// <summary>
			/// 运输单位
			/// </summary>
			public string ysdw { get; set; }

			/// <summary>
			/// 联系人
			/// </summary>
			public string lxr { get; set; }

			///// <summary>
			///// 装卸工
			///// </summary>
			//public string ry_zxg { get; set; } // 需要返回

			///// <summary>
			///// 叉车司机
			///// </summary>
			//public string ry_ccsj { get; set; } // 需要返回

			/// <summary>
			/// erp交货单号
			/// </summary>
			public string erphx_jhdh { get; set; }

			/// <summary>
			/// erp物料编码
			/// </summary>
			public string erphx_wlbm { get; set; }

			/// <summary>
			/// erp物料名称
			/// </summary>
			public string erphx_wlmc { get; set; }

			/// <summary>
			/// erp创建日期
			/// </summary>
			public string erphx_cjrq { get; set; }

			/// <summary>
			/// 货位
			/// </summary>
			public string hw { get; set; } // 需要返回

			/// <summary>
			/// 货位状态
			/// </summary>
			public string hwzt { get; set; } // 需要返回
			}

			public class CreateTaskReturnErpInfo {
			/// <summary>
			/// 计划单号（唯一标识）
			/// </summary>
			public string jhdh { get; set; }

			/// <summary>
			/// 出库状态
			/// </summary>
			public string ckzt { get; set; } // 需要返回

			/// <summary>
			/// 计划类别
			/// </summary>
			public string jhlb { get; set; }

			/// <summary>
			/// 参考单号
			/// </summary>
			public string ckdh { get; set; }

			/// <summary>
			/// 车牌号
			/// </summary>
			public string cph { get; set; }

			/// <summary>
			/// 运输方式
			/// </summary>
			public string ysfs { get; set; }

			/// <summary>
			/// 产品状态
			/// </summary>
			public string cpzt { get; set; }

			/// <summary>
			/// 买断单位
			/// </summary>
			public string mddw { get; set; }

			/// <summary>
			/// 产品代码
			/// </summary>
			public string cpdm { get; set; }

			/// <summary>
			/// 产品类别
			/// </summary>
			public string cplb { get; set; }

			/// <summary>
			/// 产品类别明细
			/// </summary>
			public string cplbmx { get; set; }

			/// <summary>
			/// 品牌
			/// </summary>
			public string pp { get; set; }

			/// <summary>
			/// 等级
			/// </summary>
			public string dj { get; set; } // 需要返回

			/// <summary>
			/// 罐号
			/// </summary>
			public string gh { get; set; }

			/// <summary>
			/// 批号
			/// </summary>
			public string ph { get; set; } // 需要返回

			/// <summary>
			/// 包装类型
			/// </summary>
			public string bzlx { get; set; }

			/// <summary>
			/// 派装单号
			/// </summary>
			public string pzdh { get; set; }

			/// <summary>
			/// 派装单单位
			/// </summary>
			public string pzd_dw { get; set; }

			/// <summary>
			/// 派装单调运编号
			/// </summary>
			public string pzd_dybh { get; set; }

			/// <summary>
			/// 派装件数
			/// </summary>
			public double pzjs { get; set; }

			/// <summary>
			/// 派装数量
			/// </summary>
			public decimal pzsl { get; set; }

			/// <summary>
			/// 派装日期(yyyy-mm-dd)
			/// </summary>
			public string pz_rq { get; set; }

			/// <summary>
			/// 派装操作日期
			/// </summary>
			public long pz_czrq { get; set; }

			/// <summary>
			/// 派装作废标记
			/// </summary>
			public int pz_zfbj { get; set; }

			/// <summary>
			/// 派装作废日期
			/// </summary>
			public long pz_zfrq { get; set; }

			/// <summary>
			/// 派装备注
			/// </summary>
			public string pz_bz { get; set; }

			/// <summary>
			/// 出库单编号
			/// </summary>
			public string ckdbh { get; set; }

			///// <summary>
			///// 实发件数
			///// </summary>
			//public double sfjs { get; set; } // 需要返回

			///// <summary>
			///// 实发数量
			///// </summary>
			//public decimal sfsl { get; set; } // 需要返回

			///// <summary>
			///// 实发车数
			///// </summary>
			//public int sfcs { get; set; } // 需要返回

			///// <summary>
			///// 装车时间
			///// </summary>
			//public string zcsj { get; set; } // 需要返回

			///// <summary>
			///// 计量单位
			///// </summary>
			//public string jldw { get; set; } // 需要返回

			///// <summary>
			///// 发货日期
			///// </summary>
			//public long fhrq { get; set; } // 需要返回

			///// <summary>
			///// 仓库代码
			///// </summary>
			//public string ckdm { get; set; } // 需要返回

			///// <summary>
			///// 发货人
			///// </summary>
			//public string fhr { get; set; } // 需要返回

			///// <summary>
			///// 操作员
			///// </summary>
			//public string czydm { get; set; } // 需要返回

			/// <summary>
			/// 审核人
			/// </summary>
			public string shr_username { get; set; }

			/// <summary>
			/// 审核日期
			/// </summary>
			public long shrq { get; set; }

			/// <summary>
			/// 作废标记
			/// </summary>
			public long zfbj { get; set; }

			/// <summary>
			/// 作废日期
			/// </summary>
			public long zfrq { get; set; }

			/// <summary>
			/// 结算单位
			/// </summary>
			public string jsdw { get; set; }

			/// <summary>
			/// 收货单位
			/// </summary>
			public string shdw { get; set; }

			/// <summary>
			/// 运输单位
			/// </summary>
			public string ysdw { get; set; }

			/// <summary>
			/// 联系人
			/// </summary>
			public string lxr { get; set; }

			///// <summary>
			///// 装卸工
			///// </summary>
			//public string ry_zxg { get; set; } // 需要返回

			///// <summary>
			///// 叉车司机
			///// </summary>
			//public string ry_ccsj { get; set; } // 需要返回

			/// <summary>
			/// erp交货单号
			/// </summary>
			public string erphx_jhdh { get; set; }

			/// <summary>
			/// erp物料编码
			/// </summary>
			public string erphx_wlbm { get; set; }

			/// <summary>
			/// erp物料名称
			/// </summary>
			public string erphx_wlmc { get; set; }

			/// <summary>
			/// erp创建日期
			/// </summary>
			public string erphx_cjrq { get; set; }

			/// <summary>
			/// 货位
			/// </summary>
			public string hw { get; set; } // 需要返回

			/// <summary>
			/// 货位状态
			/// </summary>
			public string hwzt { get; set; } // 需要返回
			}
			}
			}