I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SAP指令锁定逻辑修改：

Browse Source 
根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表；
原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；
yun-zuoyi
许心洁 5 years ago
parent f7c98e3982
commit 51d60a107a
2 changed files with 54 additions and 59 deletions
Show Stats Download Patch File Download Diff File

111
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -174,6 +174,7 @@ public class WmsEnumUtil {
return tmp; return tmp;
} }
} }
/** /**
* 主表信息 单据类型 * 主表信息 单据类型
*/ */
@ -700,9 +701,9 @@ public class WmsEnumUtil {
KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"), KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"), PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用"); UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用");
private int value; private int value;
private String code; private String code;
@ -897,7 +898,7 @@ public class WmsEnumUtil {
VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PICK_RC("KT_PICK_RC", "坤泰拣货"), KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用"); UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用");
private String value; private String value;
private String description; private String description;
@ -1037,7 +1038,7 @@ public class WmsEnumUtil {
INSTOCKED(40, "入库"), INSTOCKED(40, "入库"),
PICKED(50, "配料"), PICKED(50, "配料"),
OUT_STOCK(60, "出库"), OUT_STOCK(60, "出库"),
SCRAP(70,"报废"), SCRAP(70, "报废"),
COMMING(80, "在途"); COMMING(80, "在途");
private int value; private int value;
@ -1470,6 +1471,7 @@ public class WmsEnumUtil {
return valueOf(val); return valueOf(val);
} }
} }
/** /**
* 库存移动单状态状态:10=新建,20=已处理,30=处理出错 * 库存移动单状态状态:10=新建,20=已处理,30=处理出错
*/ */
@ -2936,64 +2938,56 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IMPORT_ORDER_TYPE { public enum IMPORT_ORDER_TYPE {
PO("PO", "要货计划"), PO("1", "PO", "要货计划"),
ASN("ASN", "ASN"), ASN("2", "ASN", "ASN"),
INSTRUCTIONS("INSTRUCTIONS", "指令"), INSTRUCTIONS("3", "INSTRUCTIONS", "指令"),
SCATTERED_OUT("C00", "零星出库指令"), SCATTERED_OUT("C00", "C00", "零星出库指令"),
SCATTERED_INT("C01", "零星入指令"), SCATTERED_INT("C01", "C01", "零星入指令"),
NC_DISMANTLING_PICKING("C02", "NC拆解领料"), NC_DISMANTLING_PICKING("C02", "C02", "NC拆解领料"),
NC_DISMANTLING_RETURN("C03", "NC拆解退料"), NC_DISMANTLING_RETURN("C03", "C03", "NC拆解退料"),
NC_SCRAPPED("C04", "NC报废指令"), NC_SCRAPPED("C04", "C04", "NC报废指令"),
NOT_JIS("NOTJIS", "非JIS指令"), NOT_JIS("NOTJIS", "NOTJIS", "非JIS指令"),
STOCK_DUMP("D00", "库存转储指令"), STOCK_DUMP("D00", "D00", "库存转储指令"),
NC_INSTOCK("D01", "NC入库指令"), NC_INSTOCK("D01", "D01", "NC入库指令"),
SMRR("B00", "SMRR退货"), SMRR("B00", "B00", "SMRR退货"),
DMR("B01", "DMR退货"), DMR("B01", "B01", "DMR退货"),
OUT_SOURCING("A00", "委外发料指令"), OUT_SOURCING("A00", "A00", "委外发料指令"),
OUT_REBACK("A01", "委外退料指令"), OUT_REBACK("A01", "A01", "委外退料指令"),
OUT_RETURN_SOURCING("A02", "委外返工发料指令"), OUT_RETURN_SOURCING("A02", "A02", "委外返工发料指令"),
OUT_RETURN_("A03", "委外返工退料指令"), OUT_RETURN_("A03", "A03", "委外返工退料指令"),
SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"), SALES_RETURN_REBACK("SALES_RETURN", "SALES_RETURN", "销售退货指令"),
CS("CS", "盘点指令"), CS("CS", "CS", "盘点指令"),
CS_ADUJUST("CS_ADUJUST", "盘点调差指令"); CS_ADUJUST("CS_ADUJUST", "CS_ADUJUST", "盘点调差指令");
private String value; private String value;
private String code;
private String description; private String description;
IMPORT_ORDER_TYPE(String value, String description) { IMPORT_ORDER_TYPE(String value, String code, String description) {
this.value = value; this.value = value;
this.code = code;
this.description = description; this.description = description;
} }
public String getDescription() { public String getValue() {
return description; return value;
} }
public String getCode() { public String getCode() {
return value; return code;
} }
public String getValue() { public String getDescription() {
return value; return description;
} }
public static IMPORT_ORDER_TYPE codeOf(String value) { public static IMPORT_ORDER_TYPE codeOf(String code) {
for (int i = 0; i < values().length; i++) { for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) { if (values()[i].code.equals(code)) {
return values()[i]; return values()[i];
} }
} }
return null; return null;
} }
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
} }
/** /**
@ -3083,7 +3077,6 @@ public class WmsEnumUtil {
} }
/** /**
* 任务数据来源：检查子数据 * 任务数据来源：检查子数据
*/ */
@ -3496,7 +3489,7 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_STOCK_TYPE { public enum WMS_STOCK_TYPE {
SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码"); SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码");
private int value; private int value;
private String description; private String description;
@ -4488,8 +4481,8 @@ public class WmsEnumUtil {
WAIT_RECEIVING(10, "待收货"), WAIT_RECEIVING(10, "待收货"),
RECEIVING(20, "收货中"), RECEIVING(20, "收货中"),
COMPLETE_RECEIVING(30, "收货完成"), COMPLETE_RECEIVING(30, "收货完成"),
CLOSE(40,"已关闭"), CLOSE(40, "已关闭"),
CANCEL(50,"已取消"), CANCEL(50, "已取消"),
UN_RECEIVED(60, "延迟未收货"); UN_RECEIVED(60, "延迟未收货");
private int value; private int value;
@ -4580,9 +4573,9 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_MASTER_STATUS { public enum WORK_ORDER_MASTER_STATUS {
CREATE(10,"CREATE", "创建"), CREATE(10, "CREATE", "创建"),
PLANNED(20,"PLANNED", "已计划"), PLANNED(20, "PLANNED", "已计划"),
CLOSE(30,"CLOSE", "已关闭"); CLOSE(30, "CLOSE", "已关闭");
private int value; private int value;
private String code; private String code;
@ -4668,8 +4661,8 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PULL_TASK_DETAILS_STATUS { public enum PULL_TASK_DETAILS_STATUS {
BE_HANDLE(10,"BE_HANDLE", "待处理"), BE_HANDLE(10, "BE_HANDLE", "待处理"),
CANCELLATION(20,"CANCELLATION", "已处理"); CANCELLATION(20, "CANCELLATION", "已处理");
private int value; private int value;
private String code; private String code;
@ -4720,10 +4713,10 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PULL_TASK_MASTER_STATUS { public enum PULL_TASK_MASTER_STATUS {
CREATE(10,"CREATE", "创建"), CREATE(10, "CREATE", "创建"),
ENABLED(20,"ENABLED", "已启动"), ENABLED(20, "ENABLED", "已启动"),
COMPLETE(30,"COMPLETE", "已完成"), COMPLETE(30, "COMPLETE", "已完成"),
CLOSE(40,"CLOSE", "已关闭"); CLOSE(40, "CLOSE", "已关闭");
private int value; private int value;
private String code; private String code;
@ -4804,8 +4797,8 @@ public class WmsEnumUtil {
} }
/** /**
* WEB页面字段类型 * WEB页面字段类型
* 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FIELD_TYPE { public enum FIELD_TYPE {
@ -4881,7 +4874,7 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_COMMIT_MODE { public enum GROUP_COMMIT_MODE {
JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交"); JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), REF_GROUP(30, 30, "关联分组号提交");
private int value; private int value;
private int code; private int code;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
import org.springframework.stereotype.Repository;
/** /**
* @Description : 系统配置 * @Description : 系统配置
@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
* @CreateDate : 2019-03-07 10:00 * @CreateDate : 2019-03-07 10:00
* @Modify: * @Modify:
**/ **/
@Repository
public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> { public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
/** /**

Write Preview
Loading…
Cancel
Save