3093 Commits (32e4bb4ba7112e4c9d86c91dad21385666bff7d2)

Author	SHA1	Message	Date
puxiao.liao	7062e7a383	bug7935【7935 二维码收货-供应商批次格式-校验不通过系统异常】	5 years ago
曾贞一	46e0f502d0	【7988 20011--多级包装打印时母条码现在无法打印出来】	5 years ago
曾贞一	a59a5e532e	【7988 20011--多级包装打印时母条码现在无法打印出来】	5 years ago
袁津哲	4dc2996bdc	业务类型实体中新增是否启用波次字段	5 years ago
袁津哲	cbe3094f2a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	ea9457a191	修复WMS波次计划实体类字段	5 years ago
钮海涛	1d16e2d938	解决合并冲突	5 years ago
贾文涛	492dfbff82	pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式	5 years ago
钮海涛	53dc57a03e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	df1cbc9449	新增供货追踪接口	5 years ago
袁津哲	3442fd4801	波次规则明细新增开窗查询字段	5 years ago
puxiao.liao	a432b77ca0	任务1536【1536 PDA组件修改增加录入车牌信息功能】	5 years ago
钮海涛	8c4cb0748b	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
钮海涛	82d5332861	修复POM文件问题	5 years ago
钮海涛	c3a5564652	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
钮海涛	6925ce3b18	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
袁津哲	a8d84b1043	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	5de3c0bd7b	移库单模型中添加创建时间字段	5 years ago
汪云昊	ec1d52e7dd	MAVEN 版本控制调整	5 years ago
贾文涛	7106c06221	统一修改pom文件的项目版本问题0331	5 years ago
袁津哲	a4d32d6612	开发波次计划根据规则生成计划功能	5 years ago
袁津哲	cb8a090aea	开发波次计划功能	5 years ago
袁津哲	ffbd512b89	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	14cfa5fa47	创建波次计划规则实体类和规则明细实体类	5 years ago
wynne1005	44696061ee	修改pom文件为最新	5 years ago
wynne1005	3c08e7794f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	eed24e0297	统一修改pom文件的项目版本问题	5 years ago
puxiao.liao	a887aa1236	1454 基于责任区域和班次的任务推送	5 years ago
wynne1005	286d605f09	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	d80b341620	还原test pom	5 years ago
puxiao.liao	bf427bbb31	bug7918【7918 条码操作记录表在更新后，缺少一行关联二维码字段，（更新后出现的问题）】	5 years ago
钮海涛	d8779f42fb	从dev拉取最新代码	5 years ago
廖普小	eb1c89e5e6	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
贾文涛	abf5d3eeb9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	048419d823	修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。	5 years ago
puxiao.liao	b626989e63	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
puxiao.liao	3a7d7a7924	bug7754【7754 需要一个接收对方信息在我们系统中触发报工的接口，当接收到数据时，需要在系统中生成一个标签，然后自动对该标签进行报工操作，接口中包含了条码，零件信息。】	5 years ago
曾贞一	58053f4972	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	56c1bf8c44	【7648 在发运界面增加一个打开单据按钮。】	5 years ago
钮海涛	cf0db5b8da	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
wynne1005	4b4bf4e433	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	a22d3d2333	动态查询：#任务1352(合并代码解决冲突)	5 years ago
许心洁	030f2948fb	动态查询：#任务1352	5 years ago
王杰	a9a7d78bd5	解决冲突	5 years ago
袁津哲	f3b7ae8bc5	优化WmsPDA插件实体，去掉本地文件夹维护	5 years ago
袁津哲	ab794aab0b	开发WMS动态加载插件功能	5 years ago
袁津哲	2a0204ad99	开发WMS动态加载插件功能	5 years ago
曾贞一	99ecde38d2	【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】	5 years ago
曾贞一	10b5885ede	【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】	5 years ago
puxiao.liao	4c199ce8ba	任务1470【 1470 504 北京麦格纳-采购收货--新增扫描二维码组件】 ... 任务1467【1467 506 北京麦格纳-推荐入库-新增推荐动态库位组件】	5 years ago
曾贞一	3d913456af	【7863 修改单据两步法操作后，单据条码明细直接变为已完成的问题】	5 years ago
许心洁	8178e90abd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	5bf7133ff1	动态查询：BUG#7845；BUG#7676；BUG#7675	5 years ago
袁津哲	df21c218cd	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	b08d20fdb6	开发WMS动态加载插件功能	5 years ago
曾贞一	779b9d209c	【修改 DEV-pom.xml】	5 years ago
袁津哲	c178540545	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	327af15040	开发WMS动态加载插件功能	5 years ago
钮海涛	1eaacd1b28	Merge branch 'test' into dev	5 years ago
钮海涛	333ef54c80	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
puxiao.liao	8a7c5fa1b5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	e3b6f03dd8	北京麦格纳WMS#511【511 北京麦格纳-NC报废NC冻结-自动不良品标签打印】 ... 北京麦格纳WMS#510【510 北京麦格纳-拣货-领料任务监控看板】 北京麦格纳WMS#508【508 北京麦格纳-拣货-根据最短路径推荐条码】 北京麦格纳WMS#507【507 北京麦格纳-计划外入库（零星入库）新增，默认批次为生产日期】 北京麦格纳WMS#505【505 北京麦格纳-采购收货-推送收货差异邮件】 北京麦格纳WMS#509【509 北京麦格纳-过期品自动报警】	5 years ago
puxiao.liao	2da53135a8	bug7761【7761 发运配料界面，执行成功与无库存未做国际化，翻译资源已配置好】 ... bug【7766 拆分打印功能操作完成后下方需要回显，拆分出的条码的零件号，条码，数量，库位。】	5 years ago
许心洁	313a0acfb8	test	5 years ago
许心洁	5b92cae5d1	3D仓库：联调优化+收货看板BUG#7308	5 years ago
puxiao.liao	9edfe18aec	【7565 收货分组功能要求。】bug7565	5 years ago
puxiao.liao	9ca00bee68	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
luweihao	12579c7a14	还原pom	5 years ago
puxiao.liao	8f584f250b	【7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件 ... 】bug7633	5 years ago
puxiao.liao	be479c2e76	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	8a98efa9a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	eaed7962ab	动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+ ... 3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）	5 years ago
曾贞一	38f1bd3b01	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	c0ce05e07c	【7648 在发运界面增加一个打开单据按钮】	5 years ago
曾贞一	2625c2cb0f	【修改 TSET-pom.xml】	5 years ago
puxiao.liao	4c0b2a1961	【 7603 单个零件标签打印功能修改。 ... 】bug7603	5 years ago
王杰	80ca438ce3	test合并到dev解决pom冲突	5 years ago
曾贞一	5ebb5cbf20	【修改 TSET-pom.xml】	5 years ago
王杰	068a0956db	解决冲突	5 years ago
王杰	b77d3065a4	Merge branch 'test' into dev	5 years ago
曾贞一	0368152e71	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
许心洁	d815ca9b12	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	2c0ef55e85	解决动态查询BUG#7674,#7676+ ... 流程导入BUG#7682	5 years ago
王杰	01c5bb59e1	Merge branch 'dev' into test	5 years ago
puxiao.liao	61d3be19cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java	5 years ago
puxiao.liao	0968cdc49e	【7601 发运单明细生成条码后，由于生成的客户条码不存在于条码表中。需要有一个界面可以查到这些条码，并且打印出来，目前的话如果生成那次的打印失败了，那就无法再次打印改条码。】BUG#7601 ... 【7567 条码状态报表希望增加一个ASN组号查询按钮，不需要增加显示字段，只是希望可以按照ASN组号查询条码】bug#7567 【7520 盘点单主界面增加库区与零件号，可以从盘点范围里取，如果有多个库区或者多个零件号，则显示为空就行,查询框增加零件号与库区字段查询】bug#7520	5 years ago
曾贞一	eefb472117	【7650 客户标签扫描】	5 years ago
曾贞一	5cc5844e45	【库存条码实体-添加字段 包装零件号】	5 years ago
许心洁	3d3f134d7f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	c9f6f336af	动态查询：解决了BUG#7658,7660,7661,7663,7664 ... 3D仓库：联调优化逻辑	5 years ago
曾贞一	0acf2dc0ae	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
钮海涛	b323b2feae	Merge remote-tracking branch 'origin/dev' into test	5 years ago
puxiao.liao	50d3de9b77	7600 二维码零件标签打印功能修改。 ... 7565 收货分组功能要求。 7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件 7628 库存调整盘点时，扫描库位后的提示增加一个库位 7640 解冻扫描条码后的提示没有显示条码，冻结是有的。需要统一都显示 7536 没库存时领料与发运的提示修改为下列 7659 创建盘点单冻结条码时条码is_vaild=2 7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。 7652 在条码状态报表中增加组号字段显示，查询框也需要增加 7454 需要一个配料撤销（针对单个条码，而不是单据）的功能，已经配料的条码需要被撤回到仓库中，需要考虑各种库存移动单状态。 7631 在盘点明细中的盘点范围界面增加一个字段，把数据库中的src_order_no显示出来，字段取名为原始单号 7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。 7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。	5 years ago
许心洁	1e0d88fb0e	动态查询：开窗和时间查询优化+3D仓库基础数据校验优化	5 years ago
许心洁	df03827264	动态查询：注解enumName属性名称改为entityName	5 years ago
许心洁	a49b747c18	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	cc98e84ba4	动态查询：增加开窗功能	5 years ago
钮海涛	85dff1fde9	Merge remote-tracking branch 'origin/dev' into test	5 years ago
qianhs	83ed87a769	【 盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】	5 years ago
曾贞一	767a9b98cd	【7568 PDA收货界面增加一个搜索框，让员工可以选择ASN单据收货】	5 years ago
luweihao	f67dd06cd4	Merge branch 'dev' into test	5 years ago
曾贞一	0a433f1ecf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	453226d6ec	【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码--修改按所有时间都可以查询出来】	5 years ago
许心洁	b8d7feb413	动态查询：添加固定查询条件：isValid，isDeleted + 给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解 ... + 字段无需区分工厂	5 years ago
许心洁	fc778833b3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	1aec8a2f5f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	a620828956	【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码】	5 years ago
qianhs	d3c30fa9be	【 盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】	5 years ago
luweihao	246dd85721	Merge branch 'dev' into test	5 years ago
陈思洁	658885ade5	合并冲突	5 years ago
陈思洁	1e431aef58	【1418 新增固化看板】	5 years ago
许心洁	55e3f212ce	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7f161e3bae	3D可视化仓库	5 years ago
jenkins	1ada447069	Jenkins自动合并	5 years ago
qianhs	91b43823c9	【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	b56d9cb824	Jenkins自动合并	5 years ago
陈思洁	c40d3360d3	【1416 新增固化时间维护】	5 years ago
jenkins	9f0a0852e7	Jenkins自动合并	5 years ago
puxiao.liao	709db0b573	【 7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。 ... 】bug7526	5 years ago
jenkins	1ee4a53d64	Jenkins自动合并	5 years ago
puxiao.liao	37ee72adaf	【 7523 条码拆箱功能输入数量时，此处提示改为“扫描成功，请输入新条码数量” ... 】bug7523	5 years ago
jenkins	9fc85191fe	Jenkins自动合并	5 years ago
puxiao.liao	759fda55b9	【 7527 1.推荐入库（推荐生产入库），如果扫描加密码错，报错有问题，2.如果扫描库位时，检查条码某项条件不符合入库规范则需要回到请扫描条码那一步。 ... 】bug7527	5 years ago
jenkins	ec0b3528f4	Jenkins自动合并	5 years ago
qianhs	243c38793b	【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	0961a7ce14	Jenkins自动合并	5 years ago
qianhs	9fe977e8c0	【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	106703a2be	Jenkins自动合并	5 years ago
qianhs	8477526bf5	【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	6a91ce5c50	Jenkins自动合并	5 years ago
qianhs	8a9c8273d8	【 发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】	5 years ago
jenkins	594577cc69	Jenkins自动合并	5 years ago
puxiao.liao	901623b254	【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。 ... 】bug7510	5 years ago
jenkins	218899aae9	Jenkins自动合并	5 years ago
puxiao.liao	f9cb6be454	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	54b167256f	【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。 ... 】bug7510	5 years ago
jenkins	f8fa1cd957	Jenkins自动合并	5 years ago
qianhs	9c754e5816	【 发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】	5 years ago
jenkins	26fd59e5c7	Jenkins自动合并	5 years ago
puxiao.liao	96e0e3756f	【 7507 发运单接收接口新增字段 ... 】bug7507	5 years ago
jenkins	24d834cd6d	Jenkins自动合并	5 years ago
qianhs	e1114d67d2	【静态盘点解冻调差时，如果勾选了所有盘点单，现在需要一个单子一个单子点击确认调差，需要在点击时将所有盘点单的调差范围都显示出来，然后一次性调差所有功能】【bug7485】	5 years ago
jenkins	7c422cad79	Jenkins自动合并	5 years ago
qianhs	591f865bf3	【成品打印需要带出客户零件号，先用单据所属的客户发往地+零件号去WMS_CUSTOMER_PART表中找客户零件号，如果找不到再用客户+零件号去找。】【bug7501】	5 years ago
jenkins	8c5020b098	Jenkins自动合并	5 years ago
曾贞一	44648e4218	【1396 亚太-领料任务明细看板】	5 years ago
王杰	01e896a752	Merge branch 'dev' into test	5 years ago
曾贞一	60ab897195	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	e14e813230	【7476 发运的新老标签对应报表】	5 years ago
jenkins	27b1f5ca21	Jenkins自动合并	5 years ago
qianhs	22eaa30dab	【收货时，如果多收了零件号，点击重置后再扫描单号，该零件号明细无法显示在下方提示中。】【bug7423】	5 years ago
jenkins	1ae61084c5	Jenkins自动合并	5 years ago
曾贞一	415ae5a45b	【7457 1.发运时，如果是两步发运，客户标签打印后，在做第二步发运出库时，需要扫描已经绑定的客户标签。】	5 years ago
jenkins	6e545a7ec1	Jenkins自动合并	5 years ago
袁津哲	db6522fba3	优化动态搜索与自定义列表代码	5 years ago
jenkins	c90df4e96a	Jenkins自动合并	5 years ago
许心洁	28ce8615fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	51d60a107a	SAP指令锁定逻辑修改： ... 根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表； 原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；	5 years ago
jenkins	7e6f83a974	Jenkins自动合并	5 years ago
陈思洁	babc158ed6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	5feae0dd1a	【1405 物流路线在物品分类及仓库级别的应用】	5 years ago
陈思洁	09339a6e1f	【1405 物流路线在物品分类及仓库级别的应用】	5 years ago
jenkins	d790bcf355	Jenkins自动合并	5 years ago
袁津哲	89a7cafee4	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	6371e8df60	Jenkins自动合并	5 years ago
袁津哲	f7c98e3982	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	a19cace3b1	Jenkins自动合并	5 years ago
puxiao.liao	86b73d43f9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	6f82fa17fd	Jenkins自动合并	5 years ago
许心洁	889c6ac548	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7f7c9ebf6e	SAP指令锁定组件逻辑修改：若根据单据号查询到了记录则不再新增了，并且调用此组件时缓存中一定得存在ORDER_NO; ... 定时重推待处理移动单入JOB容错结构修改+留个SWAGGER接口	5 years ago
qianhs	a1ec8d7293	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
puxiao.liao	347197f305	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	b64327831a	【 7402 收货回执界面，查询条件增加一个ASN组号，显示列表中也增加一个ASN组号 ... 】bug7402	5 years ago
jenkins	69ff58a67e	Jenkins自动合并	5 years ago
qianhs	61303a9f38	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	458137d216	Jenkins自动合并	5 years ago
许心洁	c2ba0a5663	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	e967001c75	Jenkins自动合并	5 years ago
许心洁	cb7f868d64	任务#1403 流程isCommitRefMove属性改为commitMode	5 years ago
袁津哲	ad8e51dfae	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	c1609539cf	Jenkins自动合并	5 years ago
许心洁	de0d57179c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	35839db806	BUG#7359 任务列表分组字段和移动单赋值逻辑更改	5 years ago
jenkins	006fd3aef3	Jenkins自动合并	5 years ago
曾贞一	3a9e719005	【vda收货时，是否分组提交】	5 years ago
jenkins	274011537c	Jenkins自动合并	5 years ago
qianhs	f1afdf92e9	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	24f9ed25c2	Jenkins自动合并	5 years ago
qianhs	9d744318cd	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	a0b67a3723	Jenkins自动合并	5 years ago
袁津哲	8285c87624	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	16a414192f	Jenkins自动合并	5 years ago
曾贞一	c543043da5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	328f2e64c5	【同批次修改】	5 years ago
qianhs	2eb14492d4	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	7057c685cc	Jenkins自动合并	5 years ago
E	c7a2c79f26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	8e168c5109	Jenkins自动合并	5 years ago
袁津哲	ff4cd68e89	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	c2e66de638	Wms动态搜索与自定义列表，表单开发	5 years ago
袁津哲	86694d3ceb	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	e88b93a22c	Jenkins自动合并	5 years ago
gcj	8245950fd3	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
gcj	51c66e9279	【宁德问题清单】	5 years ago
jenkins	8d614aef8d	Jenkins自动合并	5 years ago
陈思洁	1e0a0ff4fc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c24de431d4	【6853 数据迁移：产品报工明细表、产品发运表、产品入库表。定期迁移。】	5 years ago
曾贞一	c3ad3d260a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	3d7f88d2ee	【7201 收货BOP移库流程图】	5 years ago
gcj	8414af2011	【按规则推送邮件】	5 years ago
gcj	890b094e15	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	7090f30b94	【按规则推送邮件】	5 years ago
jenkins	56e53906ec	Jenkins自动合并	5 years ago
qianhs	241350ae83	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
E	0cc70fe2d0	【#1390 基础数据-客户信息增加导入功能】	5 years ago
jenkins	3db9a86504	Jenkins自动合并	5 years ago
袁津哲	fc19275ef0	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	4e0f40042a	Wms动态搜索与自定义列表，表单开发	5 years ago
陈思洁	b0065bd650	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	fa576d7a6d	【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】	5 years ago
jenkins	fe71007a5c	Jenkins自动合并	5 years ago
袁津哲	42bbb852c4	Wms初始化扫描实体字段新增逻辑优化	5 years ago
汪云昊	536200cf2b	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
袁津哲	2f2f24356c	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	daf3365ce3	Wms初始化扫描实体字段新增逻辑优化	5 years ago
gcj	cbe87c6bd7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	c14d6c6916	【宁德问题清单】	5 years ago
袁津哲	e5138ac4e9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	e1386275d0	Wms初始化扫描实体字段新增逻辑优化	5 years ago
陈思洁	99f79ee5db	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	25606ea25a	【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】	5 years ago
袁津哲	29f785ed35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	7d4ba10449	Wms初始化扫描实体字段新增逻辑优化	5 years ago
jenkins	ae8475de5d	Jenkins自动合并	5 years ago
许心洁	2f90982e68	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	c53c8c04e3	BUG#7186	5 years ago
jenkins	b0bbf43a9b	Jenkins自动合并	5 years ago
宋军超	b0f60a9176	2020-01-08创建动态列表与查询model	5 years ago
jenkins	75dc17f4c4	Jenkins自动合并	5 years ago
e-jiawentao1	7b696d7e73	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	a92090a3ab	2020-01-07创建动态查询与表单各层	5 years ago
e-jiawentao1	c51453a856	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	9fbc120666	动态搜索与自定义列表初始化扫描Bean字段	5 years ago
jenkins	189bece3f7	Jenkins自动合并	5 years ago
e-jiawentao1	b2edab4ef4	2020-01-07创建动态查询与表单dao	5 years ago
e-jiawentao1	1dba90f768	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	b939ce6625	2020-01-07创建动态查询实体	5 years ago
王杰	685d7949bf	Merge branch 'dev' into test	5 years ago
许心洁	7d63a933c0	生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家：加上可设置是否提交逻辑	5 years ago
jenkins	a685cd208d	Jenkins自动合并	5 years ago
许心洁	267ec6c647	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	823f818abf	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
许心洁	fe809e2eff	定时处理遗漏的待处理移动单JOB：处理周期改为可配置的JOB参数+流程管家：在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错	5 years ago
曾贞一	989e05c64c	【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】	5 years ago
jenkins	dfb06def2b	Jenkins自动合并	5 years ago
曾贞一	9e9d3e2afa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5a4510cedb	【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】	5 years ago
陈思洁	bae2130d72	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	1f1f6ec825	【KT-1346 增加拉动任务的暂停和开启】	5 years ago
WYnneaoapc	adb4bd2a1c	Merge branch 'dev' into test	5 years ago
puxiao.liao	0d2df2ec43	【 7194 Po明细导出，单据状态为中文 ... 】bug7194	5 years ago
puxiao.liao	a3a5e63baa	【 7194 Po明细导出，单据状态为中文 ... 】bug7194	5 years ago
许心洁	861f46323b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7594b3d515	SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消	5 years ago
E	a1276b5542	【#1338 库位物料中需要增加批量导入】	5 years ago
许心洁	a231651315	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	0a7f6ebf24	Merge branch 'dev' into test	5 years ago
gcj	b29347c409	【坤泰运输管理】	5 years ago
许心洁	9a272f8b6a	BUG#6755：移动单监听队列新增逻辑：如果当前处理的移动单的交易类型配置成需要推送异常邮件，并且全局参数“系统管理员”也有配置，则随送异常邮件	5 years ago
jenkins	688d976683	Jenkins自动合并	5 years ago
陈思洁	05efdbb568	【KT-1339 安全库存拉动，新增低于起订量概念】	5 years ago
陈思洁	1e1e5e907e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	472adfd03c	【KT-1339 安全库存拉动，新增低于起订量概念】	5 years ago
WYnneaoapc	569c2613fe	Merge branch 'dev' into test	5 years ago
puxiao.liao	f8e3edabc3	【 7159 线边退料逻辑错误，应该为：扫描A条码，输入原条码的剩余数量，拆包生成的新条码留在线边，原条码退回仓库。若数量与原条码相等，则不做拆包。 ... 】bug7159	5 years ago
jenkins	028ae09f9c	Jenkins自动合并	5 years ago
曾贞一	2da366630f	【VDA波次配料--物料汇总优化】	5 years ago
曾贞一	ed25a6f7d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	46bf93f410	【VDA波次配料--物料汇总优化】	5 years ago
jenkins	9ee137a5c3	Jenkins自动合并	5 years ago
gcj	5c838ebcf1	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
gcj	62c50e04cc	【宁德问题清单】	5 years ago
jenkins	c830600235	Jenkins自动合并	5 years ago
E	b175de4635	【#1335 基础数据-包装规格管理-增加导入导出】"默认容器类型"改为"容器类型"	5 years ago
E	e962a1d22a	【#1331 KT-基础数据-物料信息】“标准包装”改为“标包”	5 years ago
许心洁	d5efd000b0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	d94ccd5ac5	下线扣减交易处理组件BUG：获取双精度类型数值时应该判断是否为空getHandledQtyVal	5 years ago
王杰	7287aaeb77	其他组未提交的代码	5 years ago
E	9e47c4ac5a	【#1332 基础数据-容器类型管理】新增期限单位字段	5 years ago
jenkins	b96d22b011	Jenkins自动合并	5 years ago
许心洁	018908d3cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	032bd61b87	物料拆分新增等份拆分功能+ ... 快速移库写入移动单明细的行号写入规则不对，优化性能+ 下线扣减交易处理组件修改逻辑：有条码就扣减，移动单明细表新增已处理数量，处理完毕才更新移动单的状态为已处理并传给MOVE_TO_ERP处理程序+ 实时库存明细报表新增列“处理中数量”（待过账的数量）	5 years ago
puxiao.liao	d34ba5e114	【 经讨论六合一允许扫描来源或目标不同的零件号，但是提交时需要按照目标来源拆分成不同的单据 ... 】bug7068	5 years ago
jenkins	e306cc6cdc	Jenkins自动合并	5 years ago
qianhs	7f69df95df	【存调整盘点，扫描库位后，提示内容“零件号，条码，数量”】【bug7060 】	5 years ago
jenkins	1163faaac1	Jenkins自动合并	5 years ago
曾贞一	0493feaf80	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	1f8885779f	【6714 FIFO重新变化时需要有提示信息，加组件，用通用变量设置组件保存上次的FIFO信息。】	5 years ago
陆卫豪	56fe97e200	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	9d5eac441e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	b5d50af250	【KT-1284 计划拉动-生产计划管理】	5 years ago
曾贞一	6eafdb1d7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5ea55135dc	【6714 FIFO重新变化时需要有提示信息，加组件，用通用变量设置组件保存上次的FIFO信息。】	5 years ago
jenkins	320607590b	Jenkins自动合并	5 years ago
gcj	c199b977e5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	cfa465817f	【修改模糊查询】	5 years ago
王杰	06afd98334	Merge branch 'dev' into test	5 years ago
qianhs	34e4d837af	【存调整盘点，扫描库位后，提示内容“零件号，条码，数量”】【bug7060 】	5 years ago
jenkins	6a19a07fce	Jenkins自动合并	5 years ago
gcj	7e41cde458	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	894dbed46c	【宁德问题清单】	5 years ago
jenkins	f39163513c	Jenkins自动合并	5 years ago
曾贞一	4bd0aa8d57	【系统配置-模糊查询 】	5 years ago
jenkins	1fbd9c4357	Jenkins自动合并	5 years ago
gcj	9c2dcba09d	【运输管理】添加查询关联单号	5 years ago
jenkins	cc45dbc2cb	Jenkins自动合并	5 years ago
曾贞一	91716272a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	393d3f12b8	【7055 新增波次拣货流程】	5 years ago
jenkins	695a9b2e63	Jenkins自动合并	5 years ago
陈思洁	03982ad2e0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	03eeacd273	【KT-1298 物流路线【处理模式】优化】	5 years ago
王杰	ab68895760	test分支修改pom	5 years ago
王杰	c87b00756f	dev分支修改pom	5 years ago
qianhs	1d7cf41653	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】后期待优化	5 years ago
qianhs	4c8a94bdfa	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
qianhs	a2ac02aa47	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
E	69e20029e8	【1320 KT物料信息--需要维护物料的类型：器具】增加描述：90=器具库	5 years ago
gcj	a7d1ec785b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	eb084d3904	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	0d7e64b160	在调用交易处理组件之前把交易处理组件类型名称一并赋值到MOVEMASTER对象中，省去每个组件中再去循环查询。	5 years ago
qianhs	5c28c8344c	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
WYnneaoapc	0191a17a4d	Merge branch 'dev' into test	5 years ago
gcj	b29d84bbad	【运输管理】	5 years ago
gcj	ba355aab55	【运输管理】	5 years ago
jenkins	5513e95884	Jenkins自动合并	5 years ago
gcj	01e5919349	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
jenkins	34b843bd1f	Jenkins自动合并	5 years ago
puxiao.liao	4f1455012f	【领料上线扫描时，在扫描完条码后将目标库位带出。 ... 】bug7024	5 years ago
gcj	0e1599789d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	d92850c1a4	【运输管理】	5 years ago
jenkins	03051f4fd1	Jenkins自动合并	5 years ago
puxiao.liao	0c01ffb230	【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急 ... 】6978	5 years ago
jenkins	8efcd210aa	Jenkins自动合并	5 years ago
陈思洁	d0ddf208c3	【KT-1297 物流路线的【适用范围】优化】	5 years ago
jenkins	95048bce44	Jenkins自动合并	5 years ago
qianhs	d4d30bf634	【 零件号条码打印，扫描后需要提示当前扫描零件，当前扫描数量，剩余扫描数量（标包减去扫描数量）。】【bug7020】	5 years ago
汪云昊	1318c6ef56	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
陈思洁	5d4e8a94c4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c5ae91b41e	【KT-1286 计划拉动-计划拉动JOB】	5 years ago
jenkins	55dcb795c9	Jenkins自动合并	5 years ago
许心洁	258c1ccbe8	流程导入：优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库：只能移入库状态的条码；不可多人操作同一个库位进行整库移库	5 years ago
jenkins	cfebb937fb	Jenkins自动合并	5 years ago
gcj	4c2d922ed9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	2c63820f98	【运输管理】	5 years ago
jenkins	350f7101d2	Jenkins自动合并	5 years ago
puxiao.liao	da4f32f0b4	【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急 ... 】6978	5 years ago
gcj	59e7704f67	【运输管理】装车单	5 years ago
陆卫豪	5393d6e034	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	40c64db0b1	冲突	5 years ago
陈思洁	ee14ce1d4b	【KT-快速入库功能】	5 years ago
jenkins	015d284239	Jenkins自动合并	6 years ago
puxiao.liao	99a1ec309d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
puxiao.liao	3bfb0995d5	【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位 ... 】bug1299	6 years ago
jenkins	39f4c733a4	Jenkins自动合并	6 years ago
gcj	304677e7da	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	91e3209ef9	【运输管理】	6 years ago
jenkins	6be1ef7dbd	Jenkins自动合并	6 years ago
许心洁	5a1dc6dc7d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	67f7d66782	宁德现场问题#330	6 years ago
jokelone	874fd139dc	Merge branch 'dev' into test	6 years ago
E	ef9293867f	【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】	6 years ago
jokelone	0dfb948810	Merge branch 'dev' into test	6 years ago
许心洁	927579aca5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	fc663ee283	作业流程导入导出BUG#6189	6 years ago
陈思洁	45c1fc6571	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	129e60a6df	【KT-1284 计划拉动-生产计划管理】	6 years ago
gcj	a6bb80a5a4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	2e98e17a05	【运输管理】	6 years ago
qianhs	da2cfd77b0	【 增加一个扫描零件上的条码，累计数量达到零件标包后自动打印条码+按照主数据自动报工的界面】【bug6704】	6 years ago
陈思洁	7d07580a78	合并冲突	6 years ago
陈思洁	b9844c255b	生产计划表结构增加	6 years ago
gcj	3e6ca8d039	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	a1a3d1e838	【Bug清单】------------------------------	6 years ago
于学杰	67b5069c48	1. 增加分组提交的配置字段	6 years ago
jokelone	a337f1824f	Merge branch 'dev' into test	6 years ago
陈思洁	3a353b1539	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	1d5f4b38a4	【KT-1282 计划拉动-班次管理】	6 years ago
gcj	32dccc056c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	6 years ago
gcj	1e10bdee0c	【坤泰运输管理】	6 years ago
jokelone	056dbaacf2	Merge branch 'dev' into test	6 years ago
陈思洁	eb5f9610a8	【KT-1282 计划拉动-班次管理】	6 years ago
陈思洁	5797ec4b1b	新增工位表字段	6 years ago
陈思洁	4f67cc1310	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	61f3465255	新增工位表字段	6 years ago
许心洁	49a126843b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	2ce2f17353	流程管家：新增“是否连带提交创建状态移动单”属性；新增重置功能+生产扣减交易处理组件+交易处理成功程序+ESB解析程序多余异常输出去除+质检流程加上是否允许多人操作校验+PDA动态菜单交易类型描述国际化	6 years ago
jokelone	690918add5	Merge branch 'dev' into test	6 years ago
曾贞一	594d6a4135	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	a254841385	更新 'modules/i3plus-pojo-wms/pom.xml'	6 years ago
王杰	cfa54aa2b6	修改pom	6 years ago
puxiao.liao	e580dcbd2d	【扫描查询查询一个条码的时候要分行显示该条吗的：库存地，库位，条码，状态，数量，零件号，供应商批次，过期日期，收获批次，需要分行显示】bug6663	6 years ago
曾贞一	892d63b9b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	ca71303bee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	b6ae28c957	【采购收货】	6 years ago
jenkins	d2591b419b	Jenkins自动合并	6 years ago
许心洁	e4348cd334	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	fa8a88c6d0	流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中	6 years ago
陆卫豪	93126de988	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
gcj	1d0c03ba9c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
E	831daa4964	【#1241 KT-收货看板-增加道口】	6 years ago
gcj	a35171a41d	【采购收货】	6 years ago
曾贞一	bb92161133	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jenkins	33f3fd0963	Jenkins自动合并	6 years ago
qianhs	c8f23ba640	【 库存报表中无法看到寄售零件】【bug6331】	6 years ago
puxiao.liao	91ec41b3c0	暂时注解掉索引信息。	6 years ago
曾贞一	793535e74c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	8892c78692	【EU成品发运-客户编号】	6 years ago
jenkins	f4988f68f7	Jenkins自动合并	6 years ago
puxiao.liao	7df617b290	【质检单查询界面需要支持按照ASN和零件号查询，显示出的明细中质中要显示物料信息】bug6651	6 years ago
jenkins	ad6d4f5034	Jenkins自动合并	6 years ago
陈思洁	42d1a461a4	新增附件信息表	6 years ago
jenkins	66252032b3	Jenkins自动合并	6 years ago
陈思洁	9cb03c8661	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	c6ff8f109c	新增附件信息表	6 years ago
王杰	6da48220a5	Merge branch 'dev' into test	6 years ago
puxiao.liao	1d66ce2612	【VDA推荐入库-入库成功-无引导信息】bug6645	6 years ago
jenkins	c8b0c49b57	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	544944d31c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	d0e6d30a9e	#6639 【VDA生产领料-FIFO跳过-系统异常】	6 years ago
gcj	e827462426	【采购收货】	6 years ago
wei.peng	6d5fc7ab39	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	e5767574fe	任务明细POJO添加交易类型代码字段：唯一索引	6 years ago
王杰	73b1e827d6	Merge branch 'dev' into test	6 years ago
gcj	87dd679d47	【采购收货】	6 years ago
许心洁	e37653c544	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	214b3a07b7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	f39e16511f	给所有JOB加上了redis锁+IOT解析优化+系统配置POJO参数值的类型改为长整形，否则新增时参数值过长会系统异常	6 years ago
jenkins	5947429d54	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
于学杰	8d15084b20	1. 调整5个批次的名称	6 years ago
jenkins	68b650ab81	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	8447ef39c9	【采购收货】	6 years ago
jenkins	870dc7007d	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	acbbbf8e32	【采购收货】	6 years ago
jenkins	f6506bdd0b	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	47ccfcc9e3	【EU成品发运-检查数量组件】【bug1177】 ... 【EU成品发运-检查单据是否操作完成组件】【bug1176】 【EU成品发运-成品发运FIFO推荐组件】【bug1174】	6 years ago
jenkins	2f6400dc78	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	7452d49930	【采购收货】	6 years ago
jenkins	ddee8a5215	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	314aa78336	【 采购日程单里的寄售属性选项是0/1，应改为是/否】【bug6369】	6 years ago
crish	4d3adf5daf	Merge branch 'dev' into test	6 years ago
1111	f0290a758d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
1111	e349ab3e9b	【采购收货】	6 years ago
qinjia zou	c051b6024b	【VDA物流路线-路线新增-字段赋值】bug6515	6 years ago
jenkins	04ae04246e	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	549f63aa0d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	07bda76d4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	b181cf2ac3	【安全库存拉动】	6 years ago
许心洁	77b921ef38	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b0c4d11000	流程设计界面：查询组件列表根据作业类型名称分组返回给前端+每个步骤开始前都重新获取当前流程明细的步骤参数并放入缓存（BUG#6304）	6 years ago
jenkins	edc281dffe	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qinjia zou	51d70654ef	【欧洲-生产快速入库】bug6389	6 years ago
王杰	ac5432bebb	解决冲突	6 years ago
jenkins	8eb8c2f97e	Merge branch 'master' of i3-IMPP/i3plus-pojo into test	6 years ago
王杰	9f9c095846	Merge branch 'dev' into test	6 years ago
1111	d35c6e97cd	【采购收货】	6 years ago
王杰	a595fed4fe	Merge branch 'test'	6 years ago
jenkins	e7bad502c3	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	96ea008725	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	c0d8375d0f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
1111	41a48b4b59	【采购收货】 采购收货	6 years ago
许心洁	8d6a2b53b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b7c6189308	生产汇报JOB优化（新增根据多个属性值将对象集合进行分组的公共方法）+标准收货速度优化（30%）	6 years ago
汪云昊	68f31721f0	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
qianhs	d4422bee15	【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】	6 years ago
王杰	7f08847c50	Merge branch 'test'	6 years ago
王杰	6297ccc4d7	Merge branch 'dev' into test	6 years ago
陈思洁	5050c0c5a1	新增实体--安全库存	6 years ago
qinjia zou	2210482918	【自动入库】bug6390	6 years ago
wei.peng	02a9c64a42	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
qinjia zou	a8ebcb669b	【自动入库】bug6390	6 years ago
qinjia zou	6e8977e5aa	【自动入库】bug6390	6 years ago
陆卫豪	4a76c480ac	Merge branch 'test' of i3-IMPP/i3plus-pojo into master	6 years ago
jenkins	f76aaddbd5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	a55795d43f	【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】	6 years ago
qianhs	f0b35d1d74	【VDA生产退料-条码所在库位-需为线边库位】【bug6442】 ... 【VDA收货---选择ASN订单，点击预收货，预收货成功后，按钮还可以点击。导致数据重复】【bug6464】 【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】	6 years ago
jenkins	4d2a2a35b0	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	339a12eba3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	3781713a29	实时库存-条码明细优化查询速度	6 years ago
于学杰	9e625acc0d	1. MOVE_TO_ERP 增加是否预收货字段	6 years ago
曾贞一	3ba4e9b4f1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	28078287af	【VDA收货】【预收货的单据，要在页面上可以查询-bug6465】	6 years ago
于学杰	71818c4745	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	db9a698c68	1. 增加是否寄售的属性	6 years ago
王杰	1a7164c474	Merge branch 'dev' into test	6 years ago
qianhs	48cbf9d471	【NC冻结】【350 NC冻结-4.2 批量NC冻结】【1187 NC冻结-4.2 批量NC冻结】 ... 【 库存报表中无法看到寄售零件】【bug6331】	6 years ago
puxiao.liao	3bda3169f4	【超级移库】bug6295	6 years ago
王杰	57253ea87b	Merge branch 'dev' into test	6 years ago
puxiao.liao	a441633326	【超级移库】bug6295	6 years ago
crish	5b6b303722	Merge branch 'test'	6 years ago
crish	17d5f1e512	Merge branch 'dev' into test	6 years ago
crish	410558d43c	Merge branch 'test'	6 years ago
曾贞一	7dbb55bcb0	【VDA质检】【缺了检验条码数量是否为-bug6402】	6 years ago
jenkins	b5685a7874	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	c27daae8e4	移动单条码表 --供应商编码	6 years ago
王杰	9137555226	Merge branch 'dev' into test	6 years ago
puxiao.liao	21375ed6f4	【超级移库】bug6295	6 years ago
jenkins	c1b50db526	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
puxiao.liao	1f85c75f6c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
puxiao.liao	9b8d4c900b	【事物查询】bug6294	6 years ago
1111	2077c651e7	【采购收货】	6 years ago
许心洁	60c25d7a71	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
许心洁	ccb29c5903	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
1111	2f2c843006	【坤泰-采购收货】包装关系	6 years ago
许心洁	208410340e	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
王杰	ab34ebb769	Merge branch 'dev' into test	6 years ago
qianhs	62bb71f4b0	【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】	6 years ago
许心洁	6d9787dc65	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lpx	94dc90172d	【扫描查询】bug6246	6 years ago
张哲铭	578be0650a	Merge branch 'dev' into test	6 years ago
1111	7378df1b9e	【宁德问题清单】	6 years ago
张哲铭	6871e96496	Merge branch 'dev' into test	6 years ago
1111	88a69ac7f8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	71c867dd8c	【包装规格】	6 years ago
许心洁	ac43296df3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	5dc8ffb394	日志处理队列V1.0	6 years ago
crish	c4d7a2380c	Merge branch 'test'	6 years ago
张哲铭	efbe0dfce9	Merge remote-tracking branch 'origin/dev' into test	6 years ago
lpx	fc49ddeea5	【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】	6 years ago
许心洁	e433915759	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	be75c4ec42	【VDA质检--物料信息维护】任务号1135 ... 【VDA质检--检查数量组件--修改】任务号1134 【VDA质检--检查质检箱数组件】任务号1133	6 years ago
许心洁	017cd18950	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	d428aa302d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	b7071bd0db	供应商字段 添加	6 years ago
王杰	d2c7a81893	Merge branch 'dev' into test	6 years ago
陈思洁	3ef115bbe2	新增冗余字段	6 years ago
许心洁	219bf6db9a	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	457e10bc75	1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】	6 years ago
许心洁	04453aa706	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
gaochangjiang	d0165fd342	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
陈思洁	2414993cf9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	777060450e	新增字段--目标库位	6 years ago
gaochangjiang	047b9d5e35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gaochangjiang	02e3ac4960	【库存预警】bug 修复库存预警	6 years ago
王杰	2417b40635	Merge branch 'dev' into test	6 years ago
于学杰	80c340308a	1. 修改通用接口POJO中的字段长度	6 years ago
许心洁	c9f26c22c1	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	bbec6a1002	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b112bdb5e8	成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除	6 years ago
王杰	9446a76159	Merge branch 'dev' into test	6 years ago
曾贞一	1357dfad30	【VDA收货-- 前端PC端POsn页】任务号1102 ... 【VDA收货-- 问题清单中加密库位】任务号1104 【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112 【VDA收货-- 对于分组数据如何查看分组信息】任务号1111	6 years ago
许心洁	c79786a677	合并开发分支的代码POM文件被改成DEV修改回TEST	6 years ago
许心洁	dd86ce354a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b8842edbb1	无条码打印：新功能开发完成	6 years ago
crish	88af19f8e9	修改开发环境pom文件test为dev	6 years ago
changjiang.gao	13066bd4d1	【库存预警】bug 243	6 years ago
crish	18161e8191	Merge branch 'test'	6 years ago
许心洁	3bc277178e	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	a90aa8498f	实体修改字段类型【int】改成【Integer】	6 years ago
许心洁	0c20a2b655	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	e5b5891d23	bom信息中新增冗余字符	6 years ago
许心洁	f5a8e9f130	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	610a96d2ee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	6b9c7b3ced	【VDA库存调整盘点】 添加供应商字段	6 years ago
许心洁	77fefbcf74	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	04df70114d	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	e593cc875d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
changjiang.gao	2ba7596a57	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	25f11781c1	盘点差异增加字段	6 years ago
许心洁	ba7fe81978	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	5956d5a08e	冲销：需求变更优化	6 years ago
曾贞一	26b4a5c52c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	a9045ed403	bug 5953	6 years ago
陈思洁	a54d711d95	#1085 BOM导入接口新增	6 years ago
crish	15e812c7a6	Merge branch 'test'	6 years ago
许心洁	02055a8b7e	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	18789939b0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	0526da8ee3	Merge branch 'test'	6 years ago
crish	cd74f5336f	Merge branch 'dev' into test	6 years ago
于学杰	dbc69e957a	1. 供应商物料实体增加字段	6 years ago
刘辉	e89df89f9a	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
changjiang.gao	3ab8cf112d	盘点条码差异	6 years ago
刘辉	febbea09c3	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
changjiang.gao	8808a77de6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	69e8357c69	条码数量编辑	6 years ago
于学杰	63e225026c	1. 扩展通用接口功能，支持与软适配的对接	6 years ago
刘辉	4ffc63ce83	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
bleakney.liu	f6be80db01	增加groupby 构造函数	6 years ago
许心洁	a1597c089c	成品冲销+导入转换格式（就一个不知道是什么单导入）	6 years ago
crish	1de89d732b	本地误拉了test代码，解决pom	6 years ago
crish	9f9874902d	冲突解决	6 years ago
曾贞一	e603ac66a7	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	16839f6911	成品冲销+抛异常方法封装优化	6 years ago
许心洁	2f843a8f5a	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	88754f9a71	收货看板重写	6 years ago
于学杰	68a6c85068	Merge branch 'dev' into test	6 years ago
陈思洁	cd8bd3a68b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	3828b4863c	添加保质期字段	6 years ago
曾贞一	dfdb6be4bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	6a9924eda6	【VDA生产领料】 FIFO推荐组件	6 years ago
wei.peng	e7e4a8587f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
于学杰	fcefe8de38	1. 通用接口增加调用软适配的功能（使用脚本引擎实现）	6 years ago
许心洁	7863325afd	本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原	6 years ago
许心洁	b7b78b85ac	误拉了test分支的代码：还原	6 years ago
刘辉	83a7a9e988	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
changjiang.gao	9e1b86eb2b	导出显示bug修改	6 years ago
许心洁	8deff73454	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
changjiang.gao	647508d92c	导出显示bug修改	6 years ago
刘辉	722146acd8	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
bleakney.liu	29fee6b028	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	746a04f96d	代码格式优化	6 years ago
许心洁	6fc4474699	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	a4d873f36f	添加过滤条件	6 years ago
crish	672438f2c0	Merge branch 'test'	6 years ago
许心洁	04cdf58aef	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	abd2321850	格式化代码	6 years ago
crish	0924810e64	Merge branch 'test'	6 years ago
许心洁	89ab1816e3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	71a68e8cf6	枚举	6 years ago
王杰	18bc35f60d	Merge branch 'dev' into test	6 years ago
lbwgithub	473e2caea0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	2cf4759c21	枚举	6 years ago
刘辉	60d1798b9c	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	0bdc3592e2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f67e7df17f	新增冗余字段	6 years ago
曾贞一	320c7f6b1f	【生产快速入库】生产快速入库导入接口	6 years ago
许心洁	1e41ab2e39	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
曾贞一	9d3b45d2e2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ddd91f51b5	【生产快速入库】组件选择，任务编号1051	6 years ago
许心洁	232c675444	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	84a96a22fa	新加NotNumBiggerPackContainsZero方法	6 years ago
许心洁	1b5df102e7	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	95f156adf4	所有double类型的属性都要加上精度注解，否则数据库中自动生成的类型为double	6 years ago
许心洁	1a7b4e3438	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘辉	1defd0d8be	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	113bb8755d	解决冲突	6 years ago
陈思洁	4ac7bae38b	新增hql	6 years ago
bleakney.liu	0fa1ffa23b	[物流线路修改]修改数据类型	6 years ago
bleakney.liu	f682d056be	[物流线路管理]修改查询条件	6 years ago
许心洁	653c8dca1f	直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误	6 years ago
曾贞一	2b62357ab5	VDA收货【生产快速入库】组件，任务编号1051	6 years ago
许心洁	10fcc569bd	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	e90c59ccf2	生产报工当查询到多条子物料时查询的SQL没有返回itemQty	6 years ago
许心洁	e35cf183da	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	4fc72ca358	条码模型	6 years ago
lbwgithub	81d86d1bd2	条码模型	6 years ago
许心洁	7a403a37da	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
jenkins	99382a8fca	Merge branch 'dev' into test	6 years ago
曾贞一	c509f3c707	VDA 生产快速入库	6 years ago
jenkins	0982f01eb2	Merge branch 'dev' into test	6 years ago
陈思洁	26684524f1	生产报工组件和生产报工标签组件提交	6 years ago
jenkins	7e3edd06a0	Merge branch 'dev' into test	6 years ago
陈思洁	3ba6508b0c	新增打印机配置表	6 years ago
陈思洁	22fbbe2a91	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	edfc78995b	新增打印机配置表	6 years ago
刘敏	8a94b054d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	c2a75d96da	实体字段get方法修改	6 years ago
jenkins	607d8202ae	Merge branch 'dev' into test	6 years ago
许心洁	f1f712c997	流程管家关联查询流程明细BUG：导致流程错乱	6 years ago
crish	9ae6ee5016	Merge branch 'test'	6 years ago
jenkins	d5349806c9	Merge branch 'dev' into test	6 years ago
许心洁	dcf326366e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	8f7d3b371b	流程管家：回显给前端当前步骤参数类型	6 years ago
jenkins	829171f8a4	Merge branch 'dev' into test	6 years ago
刘敏	e42cd80b8b	条码打印枚举添加待退料状态	6 years ago
jenkins	38f2716a76	Merge branch 'dev' into test	6 years ago
刘敏	bc1dea29ad	po、asn查询条件添加	6 years ago
jenkins	7ce12a9c85	Merge branch 'dev' into test	6 years ago
刘敏	522efe67b6	excel导出优化--单据状态显示枚举描述	6 years ago
jenkins	cbc5882bd5	Merge branch 'dev' into test	6 years ago
刘敏	0f82f3fbe5	导出状态添加	6 years ago
jenkins	c29c350ef8	Merge branch 'dev' into test	6 years ago
许心洁	e5591eafc5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	4b17c6ca69	Merge branch 'dev' into test	6 years ago
刘敏	e02f2bfeee	单据条码实体临时字段增加	6 years ago
许心洁	ec3ef597e8	根据工厂代码调整库存	6 years ago
crish	f3f77e63b3	Merge branch 'test'	6 years ago
crish	4d5497929a	Merge branch 'dev' into test	6 years ago
刘敏	ed29263655	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	adf699f618	移动单表是否快照临时字段新增	6 years ago
bleakney.liu	53dd9cface	add 物流路线pojo	6 years ago
刘敏	f6e9dd03b4	库存快照job开发【任务1011】	6 years ago
刘敏	4e46760fb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	f57dd8e999	库存信息表、库存条码、移动单三张表快照时间新增	6 years ago
曾贞一	6c8cfd8678	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
曾贞一	a4262c5e1e	pom文件修改 dev改成test	6 years ago
crish	b473fd1b46	pojo开发环境 pom文件修改为dev	6 years ago
crish	87f8dc38a6	测试环境	6 years ago
crish	96fd66456e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	d82e025eb9	dev环境pom文件修改为dev	6 years ago
于学杰	c974cf1450	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	d273159e3e	1. 增加目的质量状态（规则表）	6 years ago
wei.peng	61b0dfdc3b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	cb5eb56fe4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	5d1e6e8474	VDA收货 库位推荐入库规则	6 years ago
刘敏	baf39dc0ce	生产退料导入实体新增	6 years ago
刘敏	809478be44	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	d8bc8d713d	条码打印model字段添加	6 years ago
wei.peng	41588f37d7	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
bleakney.liu	2c146d39bf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	e52c310d38	add 入库pojo 和response	6 years ago
jimmy.zeng	4bfa05698f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	9e2169fa87	推荐入库 组件开发	6 years ago
曾贞一	512ebb495c	VDA收货 提交组件	6 years ago
于学杰	f6bb2ee21f	Merge branch 'dev' into test	6 years ago
曾贞一	f17c1d3d25	推荐入库 组件开发	6 years ago
jenkins	26179650f0	Merge branch 'dev' into test	6 years ago
许心洁	787f12387d	流程管家：关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理	6 years ago
jenkins	bca4f7745f	Merge branch 'dev' into test	6 years ago
许心洁	de6792426e	流程管家：单据完成提交所有待提交移动单；只推送当前移动单 ... PDA收货组件：改数后删除历史记录BUG修复	6 years ago
wei.peng	4ca0851386	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	d509e5755a	vda 收货超收处理	6 years ago
jenkins	603647bc82	Merge branch 'dev' into test	6 years ago
曾贞一	c5f43236a3	开口合同与po关系	6 years ago
汪云昊	f978ee39c8	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
于学杰	05dc432c57	1. 增加关联单位和关联数量字段	6 years ago
jimmy.zeng	bd466610d5	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	72fec8146d	修改	6 years ago
jimmy.zeng	d23045a667	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	5b6477bba6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	510485d2f0	excel导出优化--单据状态显示枚举描述	6 years ago
许心洁	59569cef66	移动单主表去掉乐观锁（处理错误移动单JOB一个事务内对一个表进行了两次操作不行，导致程序直接挂掉，事务也没回滚）+ ... 交易处理组件（出入移库）：待入库的可能是不合格的+ 公共PDA组件抛异常获取值为空	6 years ago
crish	35beb0c60e	Merge branch 'dev' into test	6 years ago
陈思洁	02270ea6e8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f5d2398e0e	VDA收货--开口合同增加字段 ... 供应商增加字段	6 years ago
于学杰	01c58e8653	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	3454712bd2	1. 增加库存快照的类文件	6 years ago
刘敏	5b7ac2c344	ASN字段修改	6 years ago
刘敏	c7734b7e26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5144d15ac4	采购单报表开发	6 years ago
crish	bbfc9b320f	Merge branch 'test'	6 years ago
crish	4a1ad40dfa	Merge branch 'dev' into test	6 years ago
许心洁	03ef38f853	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	315787197a	交易处理组件（收货）：免检写入收货事务取目的库位的值+乐观锁去掉临时属性	6 years ago
曾贞一	b5dfa7dbd2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	8d6e4fdfa5	盘点实盘导入功能	6 years ago
陈思洁	677632748d	VDA收货逻辑组件修改--修改sql中增加库存地字段显示	6 years ago
刘敏	4c39e84094	asn主表添加	6 years ago
陈思洁	3b174fc782	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f63cd5071b	新增开口合同实体	6 years ago
许心洁	a959964950	移动单三张表加上乐观锁	6 years ago
jimmy.zeng	ccffe9b7bd	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	229587fcf3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ceced4c4b6	欧洲项目 检查数量 批次格式组件编写	6 years ago
刘敏	241a478f65	excel导出优化--单据状态显示枚举描述	6 years ago
刘敏	f0fba5e23a	盘点枚举添加--excel导出	6 years ago
刘敏	8ac4f214b3	#5596	6 years ago
jimmy.zeng	836b0e933e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	09aab6d87a	盘点添加 存储区多个查询	6 years ago
jimmy.zeng	a4725e20c6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	a12a008713	盘点库位添加查询条件	6 years ago
jimmy.zeng	fd76f08af4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	8b9a4fb109	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	575aa6ea2f	库存移动单报表 添加修改人，修改时间的查询条件和列表	6 years ago
刘敏	e4cf678000	构造新增字段	6 years ago
jimmy.zeng	8f1ac3fdae	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	c05b22668f	字段修改	6 years ago
jimmy.zeng	835245f8f4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	2108a7f8e7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	4852a4754c	字段枚举值添加	6 years ago
许心洁	7da95b1ad2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	876571e877	任务：994；BUG：5498	6 years ago
jimmy.zeng	6e48f0a677	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	d8568e6d22	盘点优化代码。	6 years ago
曾贞一	5290ba6f63	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	01cb76da6d	指令移库 根据目标存储区扫描库位	6 years ago
刘敏	836f1bf870	字段修改	6 years ago
陈思洁	2af903f029	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	254f08da32	物料描述修改	6 years ago
jimmy.zeng	2e8a70d8b4	pom版本还原--pojo	6 years ago
刘敏	0faeaa6047	导出枚举添加	6 years ago
刘敏	193eba75d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5b735fe3a2	移动单枚举导出	6 years ago
许心洁	71b6c64ed0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
刘敏	5f539afd6d	移动单明细注解添加	6 years ago
许心洁	84ace781a3	流程添加默认值方式错误	6 years ago
许心洁	503b68a0a5	拉了测试的代码POM文件错乱	6 years ago
许心洁	6068ca9fd8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	cafd923d3a	流程管家：添加作业记录明细（作业记录不再更新移动单号：一个步骤记录一个作业记录明细）	6 years ago
许心洁	706ddcbba7	流程新增初始化组件明细组件赋默认值0	6 years ago
jimmy.zeng	4f58949e2d	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	5ea81cc34e	实体修改	6 years ago
陈思洁	2a90329fcf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	63be82f044	实体修改	6 years ago
jimmy.zeng	73b6088977	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	d484efb69e	明细构造新增	6 years ago
crish	5e06022e51	Merge remote-tracking branch 'remotes/origin/dev'	6 years ago
jimmy.zeng	2a7ba550d6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	b1dd7d3915	合并冲突	6 years ago
陈思洁	d269576dbf	新增字段	6 years ago
jimmy.zeng	154730e69b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	ac1090d661	报表返回字段信息添加	6 years ago
曾贞一	ae12af551b	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	cfc0de67cf	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	56a4d6b362	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	19253a9b6a	构造函数新增条码	6 years ago
wei.peng	96a29d3de8	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	18dac2b569	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy.zeng	1b06c1d07f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	592cd15add	调试枚举删除、库位导入工厂字段添加	6 years ago
许心洁	9de4d79009	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	d2036fd841	任务961，962，966，973	6 years ago
曾贞一	25e7ca08d3	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	7e5d2e1e56	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	18eff49e63	hql语句拼接修改	6 years ago
陈思洁	11aff72404	新增冗余字段	6 years ago
曾贞一	5aceaca82d	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	61822039c5	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	3f5f89bd1b	流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）	6 years ago
曾贞一	18aff86ea0	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	188e2b5efd	pom版本还原	6 years ago
于学杰	921859b996	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	fe65067ca2	1. 增加 IOT 接口配置表的 POJO	6 years ago
曾贞一	b10b967b73	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	d340133e7a	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	f56f8d714b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	617bb73dad	增加业务类型字段、修改临时变量字段类型 ... 修改hql查询字段	6 years ago
刘敏	a83b552203	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	2bc04b407e	计划日期、时间新增	6 years ago
许心洁	cb49d8d848	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	ffb6f8a17c	任务列表不分页，主要查询字段加索引	6 years ago
jimmy.zeng	4359f347c6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	acd1e6cfb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ce70994a57	盘点 按照盘点差异类型汇总	6 years ago
jimmy.zeng	a2a4dc6beb	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	4d00397411	修改盘点范围的排序规则	6 years ago
wei.peng	e8741ec364	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	b3a552d65d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	070bacf20e	所有外部单据增加创建时间和创建人的查询条件	6 years ago
曾贞一	7fab9a4d89	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	0d532b78c0	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	e1cb06da5c	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	483ea59142	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	7a935276a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	bc953bb2c8	查询条件封装	6 years ago
刘敏	de381d438a	领料单模板创建	6 years ago
曾贞一	9d70008912	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	61ce4d1b3f	优化	6 years ago
汪云昊	b9d9d7402e	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	ef40914935	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	e9c596adce	盘点hql排序修改	6 years ago
jimmy.zeng	02baed5dbf	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	4573b09392	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	2058789438	盘点业务修改bug	6 years ago
jimmy.zeng	7002ac5a8a	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	abf155ecd9	库存报表 创建人、创建时间添加	6 years ago
jimmy.zeng	221f05b175	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	839c139222	库存移动条码报表优化	6 years ago
jimmy.zeng	235498b162	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	638d9cb1a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	9ff9c11c97	字段调整	6 years ago
曾贞一	fbe8544a02	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
曾贞一	cef48801df	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	a713e835fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	aee54acafc	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	ff52a412d4	库存初始化信息	6 years ago
陈思洁	b604c5d9a0	交易记录增加字段	6 years ago
许心洁	92d4bf46ce	#5255,#5039	6 years ago
曾贞一	7a62200736	Merge remote-tracking branch 'remotes/origin/test' ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/pom.xml # modules/i3plus-pojo-mes-pcn/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-report/pom.xml # modules/i3plus-pojo-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	6 years ago
曾贞一	7ca6e46e4b	Merge branch 'dev' into test	6 years ago
jimmy.zeng	bf293d4758	生产报工时，原材料move单号写入关联移动单号中	6 years ago
刘敏	dacc203119	库存报表修改	6 years ago
曾贞一	380efb664e	Merge branch 'dev' into test	6 years ago
刘敏	8034e9e505	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	da1c9af3d4	库存报表新增	6 years ago
曾贞一	47d4a53706	Merge branch 'dev' ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/pom.xml # modules/i3plus-pojo-mes-pcn/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-report/pom.xml # modules/i3plus-pojo-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	6 years ago
曾贞一	8b457c0618	DEV 合并 TEST pom.xml文件修改	6 years ago
于学杰	4235184afc	Merge branch 'Process' into dev	6 years ago
于学杰	e7913cfb26	1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV	6 years ago
于学杰	24da688384	Merge branch 'test' into dev	6 years ago
许心洁	b3f4e62a74	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process	6 years ago
刘敏	794d4b69d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	145600a5d0	单据查询精准查询	6 years ago
许心洁	31313baec9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process	6 years ago
许心洁	f6c425c649	平台获取设备ID方式改变+所有pojo加上序列化	6 years ago
曾贞一	3db421b825	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	b3a0a71065	库存初始化信息	6 years ago
wei.peng	837d6ea567	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	af7b2404dd	Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process	6 years ago
许心洁	d8786d8132	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	a4f2a7c848	hql修改asn订单明细	6 years ago
peter.pan	f365dc197f	Merge branch 'test'	6 years ago
peter.pan	4d83030c51	Merge branch 'dev' into test	6 years ago
许心洁	6431417462	dragon	6 years ago
许心洁	fb0cc3446b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	1037f55f7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	30750923d1	字段修改类型	6 years ago
刘敏	871dbed84a	查询条件封装	6 years ago
peter.pan	363d521c36	Merge branch 'test'	6 years ago
peter.pan	d45b7b77f3	Merge branch 'dev' into test	6 years ago
曾贞一	f20c33b7f5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	898e1d39d4	盘点结果回传ERP，写入move_to_erp时做单位转换 ... 原材料扣减，单位转换	6 years ago
许心洁	bb8078cb94	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	059688410c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	17be4078be	设备信息开发	6 years ago
许心洁	b2328bb085	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	901fea5339	Merge branch 'test'	6 years ago
peter.pan	1fe05ab150	Merge branch 'dev' into test	6 years ago
曾贞一	c3fe273954	解决冲突	6 years ago
许心洁	60e6d51d35	流程管家2.0	6 years ago
peter.pan	39c5866084	Merge branch 'test'	6 years ago
peter.pan	4393c02bb3	Merge branch 'dev' into test	6 years ago
许心洁	4bad223c0d	直送发运JOB	6 years ago
曾贞一	7a4d68c409	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	a7144e3a1f	同步标识 2	6 years ago
刘敏	e09ad49fc9	物料新增结算供应商字段	6 years ago
peter.pan	161f8faee5	Merge branch 'test'	6 years ago
peter.pan	1c69b311a6	Merge branch 'dev' into test	6 years ago
刘敏	bfcd3ebaf0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
peter.pan	19871c5f27	Merge branch 'test'	6 years ago
peter.pan	8f977719c0	Merge branch 'dev' into test	6 years ago
刘敏	0a78cf4ec5	数字类型新增get	6 years ago
许心洁	ce7095932c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	1de613a09c	同步频率	6 years ago
peter.pan	31d49a1298	Merge branch 'test'	6 years ago
peter.pan	739f12657e	Merge branch 'dev' into test	6 years ago
刘敏	07008f8e1b	实体修改	6 years ago
peter.pan	562ea029fc	Merge branch 'test'	6 years ago
peter.pan	5c48b2eb79	Merge branch 'dev' into test	6 years ago
曾贞一	df49ab097b	赋默认值“待同步”为1	6 years ago
刘敏	f8fd8dbab0	同步标识修改	6 years ago
peter.pan	47238f131b	Merge branch 'test'	6 years ago
peter.pan	8daa2789a4	Merge branch 'dev' into test	6 years ago
曾贞一	1d1a2ac8b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	cf33f70e31	代码规范	6 years ago
刘敏	2aa1e9811e	数字类型方法重写	6 years ago
peter.pan	fdfdc9befb	Merge branch 'test'	6 years ago
peter.pan	bc9ac8d207	Merge branch 'dev' into test	6 years ago
刘敏	98d660f907	实体新增	6 years ago
刘敏	7811157312	实体字段新增	6 years ago
曾贞一	792dc0a190	WMS_MOVE_TO_ERP 增加字段年份	6 years ago
peter.pan	0692087834	Merge branch 'test'	6 years ago
peter.pan	5a195bfe2e	Merge branch 'dev' into test	6 years ago
曾贞一	2045b33801	单据锁定 SapOrderLock 添加字段同步标识	6 years ago
许心洁	6e30549ad4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	00fc0de4a9	冲突	6 years ago
许心洁	742e0a6f49	冲突	6 years ago
于学杰	6598a829e0	Merge branch 'dev'	6 years ago
jenkins	7bcff3cc66	Merge branch 'dev' into test	6 years ago
jenkins	cd70d9f66a	Merge branch 'dev' into test	6 years ago
刘敏	89edbcb80a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	98041fe58d	流程管家优化	6 years ago
刘敏	b4a538ebb5	单位换算	6 years ago
曾贞一	0341dd2f5e	bug #5030	6 years ago
jenkins	bc7267b777	Merge branch 'dev' into test	6 years ago
于学杰	63d7c2c6b8	1. 增加脚本引擎的POJO注释	6 years ago
刘敏	eafdcac5a4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	23c4b0742d	库存条码管理查询条件封装	6 years ago
jenkins	595a81f4b9	Merge branch 'dev' into test	6 years ago
jenkins	812be94ed3	Merge branch 'dev' into test	6 years ago