zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

master
e 2019-07-19 17:47:52 +08:00
parent b86248564d
commit 698d890cd0
19 changed files with 822 additions and 809 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
database/wms-2019-02-22.sql
View File

File diff suppressed because one or more lines are too long

10
database/wms-20190406.sql
View File

File diff suppressed because one or more lines are too long

10
database/wms-20190422.sql
View File

File diff suppressed because one or more lines are too long

14
database/wms-20190707.sql
View File

@ -2328,7 +2328,7 @@ INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348e00c3', '重量',
INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348e00c4', '计划库位', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'bin_plan', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '128', '', '', 'bin_plan', '19', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', ''); INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348e00c4', '计划库位', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'bin_plan', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '128', '', '', 'bin_plan', '19', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', '');
INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348e00c5', '单位', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'goods_unit', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '36', '', '', 'goods_unit', '20', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', ''); INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348e00c5', '单位', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'goods_unit', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '36', '', '', 'goods_unit', '20', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', '');
INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348e00c6', '未清数量', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'goods_wqm_count', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '32', '', '', 'goods_wqm_count', '21', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', ''); INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348e00c6', '未清数量', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'goods_wqm_count', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '32', '', '', 'goods_wqm_count', '21', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', '');
INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348e00c7', '收货登记数量', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'goods_qm_count', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '32', '', '', 'goods_qm_count', '22', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', ''); INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348e00c7', '批量收货数量', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'goods_qm_count', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '32', '', '', 'goods_qm_count', '22', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', '');
INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348f00c8', '行项目状态', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'noticei_sta', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '45', '', '', 'noticei_sta', '23', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', ''); INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348f00c8', '行项目状态', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'noticei_sta', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '45', '', '', 'noticei_sta', '23', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', '');
INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348f00c9', '基本单位', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'base_unit', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '45', '', '', 'base_unit', '24', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', ''); INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348f00c9', '基本单位', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'base_unit', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '45', '', '', 'base_unit', '24', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', '');
INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348f00ca', '基本单位数量', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'base_goodscount', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '45', '', '', 'base_goodscount', '25', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', ''); INSERT INTO `cgform_field` VALUES ('4028b8815e6f9314015e6fc0348f00ca', '基本单位数量', 'admin', '2017-09-11 15:03:41', 'admin', '', '', '', '', '', '120', 'base_goodscount', '', 'N', 'N', 'Y', 'N', 'Y', 'Y', '45', '', '', 'base_goodscount', '25', '0', 'group', 'text', 'string', 'admin', '2017-09-11 15:06:00', 'admin', '4028b8815e6f9314015e6fc0348b00b1', '');
@ -3241,7 +3241,7 @@ INSERT INTO `cgform_head` VALUES ('4028b8815e61a078015e61d9bb110014', '生成盘
INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fb65b790001', '下架任务', 'admin', '2017-09-11 14:52:56', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '1', '4', 'single', '0', null, null, 'wm_om_qm_i', 'admin', '2017-09-11 14:56:44', 'admin', null, 'id', null, 'bdfl_ptbd', 'ledefault', 'ledefault', '', null, null); INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fb65b790001', '下架任务', 'admin', '2017-09-11 14:52:56', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '1', '4', 'single', '0', null, null, 'wm_om_qm_i', 'admin', '2017-09-11 14:56:44', 'admin', null, 'id', null, 'bdfl_ptbd', 'ledefault', 'ledefault', '', null, null);
INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc0338d009b', '预约进货抬头', 'admin', '2017-09-11 15:03:41', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '2', '6', 'single', '0', 'wm_im_notice_i', null, 'wm_im_notice_h', 'admin', '2017-09-13 10:37:14', 'admin', null, 'id', null, 'bdfl_ptbd', 'moblieCommon002', 'moblieCommon002', '', null, null); INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc0338d009b', '预约进货抬头', 'admin', '2017-09-11 15:03:41', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '2', '6', 'single', '0', 'wm_im_notice_i', null, 'wm_im_notice_h', 'admin', '2017-09-13 10:37:14', 'admin', null, 'id', null, 'bdfl_ptbd', 'moblieCommon002', 'moblieCommon002', '', null, null);
INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc0348b00b1', '进货通知项目', 'admin', '2017-09-11 15:03:41', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '3', '2', 'single', '0', null, '1', 'wm_im_notice_i', 'admin', '2017-09-11 15:06:03', 'admin', null, 'id', null, 'bdfl_ptbd', '', '', '', null, null); INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc0348b00b1', '进货通知项目', 'admin', '2017-09-11 15:03:41', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '3', '2', 'single', '0', null, '1', 'wm_im_notice_i', 'admin', '2017-09-11 15:06:03', 'admin', null, 'id', null, 'bdfl_ptbd', '', '', '', null, null);
INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc3364d00ce', '收货登记', 'admin', '2017-09-11 15:06:58', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '1', '2', 'single', '0', null, null, 'wm_in_qm_i', 'admin', '2017-09-11 15:07:31', 'admin', null, 'id', null, 'bdfl_ptbd', 'ledefault', 'ledefault', '', null, null); INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc3364d00ce', '批量收货', 'admin', '2017-09-11 15:06:58', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '1', '2', 'single', '0', null, null, 'wm_in_qm_i', 'admin', '2017-09-11 15:07:31', 'admin', null, 'id', null, 'bdfl_ptbd', 'ledefault', 'ledefault', '', null, null);
INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc3374d00eb', '上架列表', 'admin', '2017-09-11 15:06:58', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '1', '2', 'single', '0', null, null, 'wm_to_up_goods', 'admin', '2017-09-11 15:07:15', 'admin', null, 'id', null, 'bdfl_ptbd', 'ledefault', 'ledefault', '', null, null); INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc3374d00eb', '上架列表', 'admin', '2017-09-11 15:06:58', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '1', '2', 'single', '0', null, null, 'wm_to_up_goods', 'admin', '2017-09-11 15:07:15', 'admin', null, 'id', null, 'bdfl_ptbd', 'ledefault', 'ledefault', '', null, null);
INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc547390106', '出货通知抬头', 'admin', '2017-09-11 15:09:13', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '2', '5', 'single', '0', 'wm_om_notice_i', null, 'wm_om_notice_h', 'admin', '2017-09-11 15:11:03', 'admin', null, 'id', null, 'bdfl_ptbd', 'ledefault', 'ledefault', '', null, null); INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc547390106', '出货通知抬头', 'admin', '2017-09-11 15:09:13', 'admin', 'Y', 'Y', 'Y', 'N', '', 'UUID', '2', '5', 'single', '0', 'wm_om_notice_i', null, 'wm_om_notice_h', 'admin', '2017-09-11 15:11:03', 'admin', null, 'id', null, 'bdfl_ptbd', 'ledefault', 'ledefault', '', null, null);
INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc54820011d', '出货通知项目', 'admin', '2017-09-11 15:09:14', 'admin', 'Y', 'Y', 'N', 'N', '', 'UUID', '3', '3', 'single', '0', null, '1', 'wm_om_notice_i', 'admin', '2017-09-11 15:11:03', 'admin', null, 'id', null, 'bdfl_ptbd', '', '', '', null, null); INSERT INTO `cgform_head` VALUES ('4028b8815e6f9314015e6fc54820011d', '出货通知项目', 'admin', '2017-09-11 15:09:14', 'admin', 'Y', 'Y', 'N', 'N', '', 'UUID', '3', '3', 'single', '0', null, '1', 'wm_om_notice_i', 'admin', '2017-09-11 15:11:03', 'admin', null, 'id', null, 'bdfl_ptbd', '', '', '', null, null);
@ -12599,7 +12599,7 @@ INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da544630a0215', null, '1'
INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da54c5f51022e', null, '1', '外包卸货费', '30', 'cgReportController.do?list&id=wm_inqm_feiy', '8a7ba3345d976595015d9e11708c0121', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2017-10-18 13:32:21', null, 'admin'); INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da54c5f51022e', null, '1', '外包卸货费', '30', 'cgReportController.do?list&id=wm_inqm_feiy', '8a7ba3345d976595015d9e11708c0121', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2017-10-18 13:32:21', null, 'admin');
INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da54cb4bf0230', null, '1', '费用明细', '10', 'wmDayCostController.do?list', '8a7ba3345d976595015d9e11708c0121', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2018-01-24 11:35:10', null, 'admin'); INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da54cb4bf0230', null, '1', '费用明细', '10', 'wmDayCostController.do?list', '8a7ba3345d976595015d9e11708c0121', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2018-01-24 11:35:10', null, 'admin');
INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da54d340a0234', null, '1', '费用合计', '20', 'wvDayCostSumController.do?list', '8a7ba3345d976595015d9e11708c0121', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2018-01-24 11:35:34', null, 'admin'); INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da54d340a0234', null, '1', '费用合计', '20', 'wvDayCostSumController.do?list', '8a7ba3345d976595015d9e11708c0121', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2018-01-24 11:35:34', null, 'admin');
INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da54f7ffe0238', null, '1', '收货登记', '20', 'wmInQmIController.do?list', '8a7ba3345d93bb87015d93e846290027', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2017-08-20 19:56:36', null, 'admin'); INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da54f7ffe0238', null, '1', '批量收货', '20', 'wmInQmIController.do?list', '8a7ba3345d93bb87015d93e846290027', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2017-08-20 19:56:36', null, 'admin');
INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da5500cec023a', null, '1', '生成储位转移', '30', 'wvStockController.do?movelist', '8a7ba3345d9e6e2b015db556358102b4', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2017-10-05 15:12:00', null, 'admin'); INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da5500cec023a', null, '1', '生成储位转移', '30', 'wvStockController.do?movelist', '8a7ba3345d9e6e2b015db556358102b4', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2017-10-05 15:12:00', null, 'admin');
INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da5503eae023c', null, '1', '理货任务', '40', 'cgReportController.do?list&id=WMLHRW', '8a7ba3345d9e6e2b015db556358102b4', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2017-11-01 23:11:01', null, 'admin'); INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da5503eae023c', null, '1', '理货任务', '40', 'cgReportController.do?list&id=WMLHRW', '8a7ba3345d9e6e2b015db556358102b4', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', '', null, null, 'admin', '2017-11-01 23:11:01', null, 'admin');
INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da5516d22023e', null, '0', '预警管理', '075', '', null, '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', 'icon-volume-up', 'admin', '管理员', null, null, '2017-08-03 07:39:23', null); INSERT INTO `t_s_function` VALUES ('8a7ba3345d9e6e2b015da5516d22023e', null, '0', '预警管理', '075', '', null, '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', 'icon-volume-up', 'admin', '管理员', null, null, '2017-08-03 07:39:23', null);
@ -12721,7 +12721,7 @@ INSERT INTO `t_s_log` VALUES ('2c9184e1690db7e301690db8373c0000', 'Chrome', '用
INSERT INTO `t_s_log` VALUES ('2c9184e1690db7e301690db857a70001', 'Chrome', '错误异常: MySQLSyntaxErrorException,错误描述：Unknown column \'this_.BZHI_QI\' in \'field list\'', '6', '172.17.4.97', '2019-02-21 09:42:59', '3', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('2c9184e1690db7e301690db857a70001', 'Chrome', '错误异常: MySQLSyntaxErrorException,错误描述：Unknown column \'this_.BZHI_QI\' in \'field list\'', '6', '172.17.4.97', '2019-02-21 09:42:59', '3', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('2c9184e1690db7e301690db88f8a0005', 'Chrome', '错误异常: BusinessException,错误描述：Unknown column \'BZHI_QI\' in \'field list\'; SQL [n/a]; nested exception is org.hibernate.exception.SQLGrammarException: Unknown column \'BZHI_QI\' in \'field list\'', '6', '172.17.4.97', '2019-02-21 09:43:13', '3', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('2c9184e1690db7e301690db88f8a0005', 'Chrome', '错误异常: BusinessException,错误描述：Unknown column \'BZHI_QI\' in \'field list\'; SQL [n/a]; nested exception is org.hibernate.exception.SQLGrammarException: Unknown column \'BZHI_QI\' in \'field list\'', '6', '172.17.4.97', '2019-02-21 09:43:13', '3', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('2c9184e1690db7e301690db9f9b7000a', 'Chrome', '进货通知添加成功', '3', '172.17.4.97', '2019-02-21 09:44:46', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('2c9184e1690db7e301690db9f9b7000a', 'Chrome', '进货通知添加成功', '3', '172.17.4.97', '2019-02-21 09:44:46', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('2c9184e1690db7e301690dba443f000c', 'Chrome', '收货登记添加成功', '3', '172.17.4.97', '2019-02-21 09:45:05', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('2c9184e1690db7e301690dba443f000c', 'Chrome', '批量收货添加成功', '3', '172.17.4.97', '2019-02-21 09:45:05', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('40288182682b2a8501682b3466ba0000', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.2', '2019-01-08 10:04:41', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('40288182682b2a8501682b3466ba0000', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.2', '2019-01-08 10:04:41', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('40288182682b2a8501682b3467830001', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.2', '2019-01-08 10:04:41', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('40288182682b2a8501682b3467830001', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.2', '2019-01-08 10:04:41', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('40288182682b2a8501682b3467b80002', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.2', '2019-01-08 10:04:41', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('40288182682b2a8501682b3467b80002', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.2', '2019-01-08 10:04:41', '1', '4028b8815df2ac6c015df2b115940004');
@ -12865,7 +12865,7 @@ INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167c66f27900fd1', 'Chrome', '出
INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167c66f2db70fd2', 'Chrome', '出货通知删除成功', '4', '192.168.1.50', '2018-12-19 20:27:14', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167c66f2db70fd2', 'Chrome', '出货通知删除成功', '4', '192.168.1.50', '2018-12-19 20:27:14', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167c673786b0fd4', 'Chrome', '仓位定义添加成功', '3', '192.168.1.50', '2018-12-19 20:31:55', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167c673786b0fd4', 'Chrome', '仓位定义添加成功', '3', '192.168.1.50', '2018-12-19 20:31:55', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167c6921c990fd8', 'Chrome', '进货通知添加成功', '3', '192.168.1.50', '2018-12-19 21:05:24', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167c6921c990fd8', 'Chrome', '进货通知添加成功', '3', '192.168.1.50', '2018-12-19 21:05:24', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167c692ca450fda', 'Chrome', '收货登记添加成功', '3', '192.168.1.50', '2018-12-19 21:06:08', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167c692ca450fda', 'Chrome', '批量收货添加成功', '3', '192.168.1.50', '2018-12-19 21:06:08', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167d9b2a5611940', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.50', '2018-12-23 14:13:43', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167d9b2a5611940', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.50', '2018-12-23 14:13:43', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167d9b2a5be1941', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.50', '2018-12-23 14:13:43', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167d9b2a5be1941', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.50', '2018-12-23 14:13:43', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167d9b4ce241942', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.50', '2018-12-23 14:16:04', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402881b26793c13b0167d9b4ce241942', 'Chrome', '用户: admin[欣康宁]common.login.success', '1', '192.168.1.50', '2018-12-23 14:16:04', '1', '4028b8815df2ac6c015df2b115940004');
@ -12894,7 +12894,7 @@ INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821dd2d020007', 'Chrome', '错
INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821dd401a0008', 'Chrome', '错误异常: QueryException,错误描述：expecting \'\'\', found \'<EOF>\' [from com.zzjee.md.entity.MvCusOtherEntity where 1!=1 or cusName like \'%jing\'d%\' ]', '6', '2.0.1.2', '2019-01-06 14:32:55', '3', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821dd401a0008', 'Chrome', '错误异常: QueryException,错误描述：expecting \'\'\', found \'<EOF>\' [from com.zzjee.md.entity.MvCusOtherEntity where 1!=1 or cusName like \'%jing\'d%\' ]', '6', '2.0.1.2', '2019-01-06 14:32:55', '3', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821de801e000a', 'Chrome', '上架成功', '4', '2.0.1.2', '2019-01-06 14:34:16', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821de801e000a', 'Chrome', '上架成功', '4', '2.0.1.2', '2019-01-06 14:34:16', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821e14216000f', 'Chrome', '进货通知添加成功', '3', '2.0.1.2', '2019-01-06 14:37:17', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821e14216000f', 'Chrome', '进货通知添加成功', '3', '2.0.1.2', '2019-01-06 14:37:17', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821e3543a0011', 'Chrome', '收货登记添加成功', '3', '2.0.1.2', '2019-01-06 14:39:33', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821e3543a0011', 'Chrome', '批量收货添加成功', '3', '2.0.1.2', '2019-01-06 14:39:33', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821e43b7b0013', 'Chrome', '上架成功', '4', '2.0.1.2', '2019-01-06 14:40:32', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821e43b7b0013', 'Chrome', '上架成功', '4', '2.0.1.2', '2019-01-06 14:40:32', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821e9ec880018', 'Chrome', '添加成功', '3', '2.0.1.2', '2019-01-06 14:46:45', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821e9ec880018', 'Chrome', '添加成功', '3', '2.0.1.2', '2019-01-06 14:46:45', '1', '4028b8815df2ac6c015df2b115940004');
INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821ec5661001a', 'Chrome', '添加到下架任务清单成功', '5', '2.0.1.2', '2019-01-06 14:49:23', '1', '4028b8815df2ac6c015df2b115940004'); INSERT INTO `t_s_log` VALUES ('402882ec6821bf47016821ec5661001a', 'Chrome', '添加到下架任务清单成功', '5', '2.0.1.2', '2019-01-06 14:49:23', '1', '4028b8815df2ac6c015df2b115940004');
@ -37326,7 +37326,7 @@ CREATE TABLE `wm_im_notice_i` (
`bin_plan` varchar(128) DEFAULT NULL COMMENT '计划库位', `bin_plan` varchar(128) DEFAULT NULL COMMENT '计划库位',
`goods_unit` varchar(36) DEFAULT NULL COMMENT '单位', `goods_unit` varchar(36) DEFAULT NULL COMMENT '单位',
`goods_wqm_count` varchar(32) DEFAULT NULL COMMENT '未清数量', `goods_wqm_count` varchar(32) DEFAULT NULL COMMENT '未清数量',
`goods_qm_count` varchar(32) DEFAULT NULL COMMENT '收货登记数量', `goods_qm_count` varchar(32) DEFAULT NULL COMMENT '批量收货数量',
`noticei_sta` varchar(45) DEFAULT NULL COMMENT '行项目状态', `noticei_sta` varchar(45) DEFAULT NULL COMMENT '行项目状态',
`base_unit` varchar(45) DEFAULT NULL COMMENT '基本单位', `base_unit` varchar(45) DEFAULT NULL COMMENT '基本单位',
`base_goodscount` varchar(45) DEFAULT NULL COMMENT '基本单位数量', `base_goodscount` varchar(45) DEFAULT NULL COMMENT '基本单位数量',

4
doc/03分析设计/数据库设计/jeewms仓储管理系统v1.0.pdm
View File

@ -39635,13 +39635,13 @@ end</a:Text>
</o:Column> </o:Column>
<o:Column Id="o2543"> <o:Column Id="o2543">
<a:ObjectID>2C90CE4E-E1B2-4E40-8CCC-13A5C36CFEC6</a:ObjectID> <a:ObjectID>2C90CE4E-E1B2-4E40-8CCC-13A5C36CFEC6</a:ObjectID>
<a:Name>收货登记数量</a:Name> <a:Name>批量收货数量</a:Name>
<a:Code>goods_qm_count</a:Code> <a:Code>goods_qm_count</a:Code>
<a:CreationDate>1534327358</a:CreationDate> <a:CreationDate>1534327358</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1534477570</a:ModificationDate> <a:ModificationDate>1534477570</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<a:Comment>收货登记数量</a:Comment> <a:Comment>批量收货数量</a:Comment>
<a:DataType>varchar(32)</a:DataType> <a:DataType>varchar(32)</a:DataType>
<a:Length>32</a:Length> <a:Length>32</a:Length>
<a:ExtendedAttributesText>{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,56={9C949EAB-FF87-446D-938C-8F03A4ABDC8E},National,4=true <a:ExtendedAttributesText>{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,56={9C949EAB-FF87-446D-938C-8F03A4ABDC8E},National,4=true

50
src/main/java/com/zzjee/wm/controller/WmInQmIController.java
View File

@ -64,7 +64,7 @@ import com.zzjee.wmutil.wmUtil;
/** /**
* @Title: Controller * @Title: Controller
* @Description: 收货登记 * @Description: 批量收货
* @author erzhongxmu * @author erzhongxmu
* @date 2017-08-20 19:48:00 * @date 2017-08-20 19:48:00
* @version V1.0 * @version V1.0
@ -89,7 +89,7 @@ public class WmInQmIController extends BaseController {
/** /**
* 收货登记列表 页面跳转 * 批量收货列表 页面跳转
* *
* @return * @return
*/ */
@ -193,7 +193,7 @@ public class WmInQmIController extends BaseController {
TagUtil.datagrid(response, dataGrid); TagUtil.datagrid(response, dataGrid);
} }
/** /**
* 删除收货登记 * 删除批量收货
* *
* @return * @return
*/ */
@ -203,14 +203,14 @@ public class WmInQmIController extends BaseController {
String message = null; String message = null;
AjaxJson j = new AjaxJson(); AjaxJson j = new AjaxJson();
wmInQmI = systemService.getEntity(WmInQmIEntity.class, wmInQmI.getId()); wmInQmI = systemService.getEntity(WmInQmIEntity.class, wmInQmI.getId());
message = "收货登记删除成功"; message = "批量收货删除成功";
try { try {
wmInQmIService.delete(wmInQmI); wmInQmIService.delete(wmInQmI);
systemService.addLog(message, Globals.Log_Type_DEL, systemService.addLog(message, Globals.Log_Type_DEL,
Globals.Log_Leavel_INFO); Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "收货登记删除失败"; message = "批量收货删除失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -313,7 +313,7 @@ public class WmInQmIController extends BaseController {
} }
/** /**
* 批量删除收货登记 * 批量删除批量收货
* *
* @return * @return
*/ */
@ -322,7 +322,7 @@ public class WmInQmIController extends BaseController {
public AjaxJson doBatchDel(String ids, HttpServletRequest request) { public AjaxJson doBatchDel(String ids, HttpServletRequest request) {
String message = null; String message = null;
AjaxJson j = new AjaxJson(); AjaxJson j = new AjaxJson();
message = "收货登记删除成功"; message = "批量收货删除成功";
try { try {
for (String id : ids.split(",")) { for (String id : ids.split(",")) {
WmInQmIEntity wmInQmI = systemService.getEntity( WmInQmIEntity wmInQmI = systemService.getEntity(
@ -333,7 +333,7 @@ public class WmInQmIController extends BaseController {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "收货登记删除失败"; message = "批量收货删除失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -401,7 +401,7 @@ public class WmInQmIController extends BaseController {
} }
if (goodsno <= 0) { if (goodsno <= 0) {
j.setSuccess(false); j.setSuccess(false);
j.setMsg("已经收货登记完毕"); j.setMsg("已经批量收货完毕");
} }
} }
mdgoods.setShpMingCheng(mvgoods.getGoodsName()); mdgoods.setShpMingCheng(mvgoods.getGoodsName());
@ -410,7 +410,7 @@ public class WmInQmIController extends BaseController {
} }
/** /**
* 添加收货登记 * 添加批量收货
* *
* @return * @return
*/ */
@ -420,7 +420,7 @@ public class WmInQmIController extends BaseController {
String message = null; String message = null;
AjaxJson j = new AjaxJson(); AjaxJson j = new AjaxJson();
String flag = "N"; String flag = "N";
message = "收货登记添加成功"; message = "批量收货添加成功";
try { try {
if (Double.parseDouble(wmInQmI.getQmOkQuat()) <= 0) { if (Double.parseDouble(wmInQmI.getQmOkQuat()) <= 0) {
j.setSuccess(false); j.setSuccess(false);
@ -545,7 +545,7 @@ public class WmInQmIController extends BaseController {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "收货登记添加失败"; message = "批量收货添加失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -557,7 +557,7 @@ public class WmInQmIController extends BaseController {
/** /**
* 更新收货登记 * 更新批量收货
* *
* @return * @return
@ -567,7 +567,7 @@ public class WmInQmIController extends BaseController {
public AjaxJson dobatchUpdatedate(WmInQmIEntity wmInQmI, HttpServletRequest request) { public AjaxJson dobatchUpdatedate(WmInQmIEntity wmInQmI, HttpServletRequest request) {
String message = null; String message = null;
AjaxJson j = new AjaxJson(); AjaxJson j = new AjaxJson();
message = "收货登记更新成功"; message = "批量收货更新成功";
WmInQmIEntity t = wmInQmIService.get(WmInQmIEntity.class, WmInQmIEntity t = wmInQmIService.get(WmInQmIEntity.class,
request.getParameter("id")); request.getParameter("id"));
@ -593,7 +593,7 @@ public class WmInQmIController extends BaseController {
/** /**
* 更新收货登记 * 更新批量收货
* *
* @return * @return
@ -603,7 +603,7 @@ public class WmInQmIController extends BaseController {
public AjaxJson dobatchUpdate(WmInQmIEntity wmInQmI, HttpServletRequest request) { public AjaxJson dobatchUpdate(WmInQmIEntity wmInQmI, HttpServletRequest request) {
String message = null; String message = null;
AjaxJson j = new AjaxJson(); AjaxJson j = new AjaxJson();
message = "收货登记更新成功"; message = "批量收货更新成功";
WmInQmIEntity t = wmInQmIService.get(WmInQmIEntity.class, WmInQmIEntity t = wmInQmIService.get(WmInQmIEntity.class,
request.getParameter("id")); request.getParameter("id"));
@ -637,7 +637,7 @@ public class WmInQmIController extends BaseController {
/** /**
* 更新收货登记 * 更新批量收货
* *
* @return * @return
*/ */
@ -646,7 +646,7 @@ public class WmInQmIController extends BaseController {
public AjaxJson doUpdate(WmInQmIEntity wmInQmI, HttpServletRequest request) { public AjaxJson doUpdate(WmInQmIEntity wmInQmI, HttpServletRequest request) {
String message = null; String message = null;
AjaxJson j = new AjaxJson(); AjaxJson j = new AjaxJson();
message = "收货登记更新成功"; message = "批量收货更新成功";
WmInQmIEntity t = wmInQmIService.get(WmInQmIEntity.class, WmInQmIEntity t = wmInQmIService.get(WmInQmIEntity.class,
wmInQmI.getId()); wmInQmI.getId());
try { try {
@ -668,7 +668,7 @@ public class WmInQmIController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "收货登记更新失败"; message = "批量收货更新失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -676,7 +676,7 @@ public class WmInQmIController extends BaseController {
} }
/** /**
* 收货登记新增页面跳转 * 批量收货新增页面跳转
* *
* @return * @return
*/ */
@ -733,7 +733,7 @@ public class WmInQmIController extends BaseController {
} }
/** /**
* 收货登记编辑页面跳转 * 批量收货编辑页面跳转
* *
* @return * @return
*/ */
@ -790,9 +790,9 @@ for (WmInQmIEntity wmInQmIEntity : wmInQmIso) {
} }
wmInQmIs.add(wmInQmIEntity); wmInQmIs.add(wmInQmIEntity);
} }
modelMap.put(NormalExcelConstants.FILE_NAME, "收货登记"); modelMap.put(NormalExcelConstants.FILE_NAME, "批量收货");
modelMap.put(NormalExcelConstants.CLASS, WmInQmIEntity.class); modelMap.put(NormalExcelConstants.CLASS, WmInQmIEntity.class);
modelMap.put(NormalExcelConstants.PARAMS, new ExportParams("收货登记列表", modelMap.put(NormalExcelConstants.PARAMS, new ExportParams("批量收货列表",
"导出人:" + ResourceUtil.getSessionUserName().getRealName(), "导出人:" + ResourceUtil.getSessionUserName().getRealName(),
"导出信息")); "导出信息"));
modelMap.put(NormalExcelConstants.DATA_LIST, wmInQmIs); modelMap.put(NormalExcelConstants.DATA_LIST, wmInQmIs);
@ -809,9 +809,9 @@ for (WmInQmIEntity wmInQmIEntity : wmInQmIso) {
public String exportXlsByT(WmInQmIEntity wmInQmI, public String exportXlsByT(WmInQmIEntity wmInQmI,
HttpServletRequest request, HttpServletResponse response, HttpServletRequest request, HttpServletResponse response,
DataGrid dataGrid, ModelMap modelMap) { DataGrid dataGrid, ModelMap modelMap) {
modelMap.put(NormalExcelConstants.FILE_NAME, "收货登记"); modelMap.put(NormalExcelConstants.FILE_NAME, "批量收货");
modelMap.put(NormalExcelConstants.CLASS, WmInQmIEntity.class); modelMap.put(NormalExcelConstants.CLASS, WmInQmIEntity.class);
modelMap.put(NormalExcelConstants.PARAMS, new ExportParams("收货登记列表", modelMap.put(NormalExcelConstants.PARAMS, new ExportParams("批量收货列表",
"导出人:" + ResourceUtil.getSessionUserName().getRealName(), "导出人:" + ResourceUtil.getSessionUserName().getRealName(),
"导出信息")); "导出信息"));
modelMap.put(NormalExcelConstants.DATA_LIST, new ArrayList()); modelMap.put(NormalExcelConstants.DATA_LIST, new ArrayList());

14
src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java
View File

@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.Validator; import javax.validation.Validator;
import com.zzjee.md.entity.MvCusEntity;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jeecgframework.core.beanvalidator.BeanValidators; import org.jeecgframework.core.beanvalidator.BeanValidators;
@ -21,11 +22,7 @@ import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery;
import org.jeecgframework.core.common.model.json.AjaxJson; import org.jeecgframework.core.common.model.json.AjaxJson;
import org.jeecgframework.core.common.model.json.DataGrid; import org.jeecgframework.core.common.model.json.DataGrid;
import org.jeecgframework.core.constant.Globals; import org.jeecgframework.core.constant.Globals;
import org.jeecgframework.core.util.ExceptionUtil; import org.jeecgframework.core.util.*;
import org.jeecgframework.core.util.JSONHelper;
import org.jeecgframework.core.util.MyBeanUtils;
import org.jeecgframework.core.util.ResourceUtil;
import org.jeecgframework.core.util.StringUtil;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.entity.ImportParams;
@ -256,6 +253,13 @@ public class WmToMoveGoodsController extends BaseController {
WmToMoveGoodsEntity t = wmToMoveGoodsService.get(WmToMoveGoodsEntity.class, wmToMoveGoods.getId()); WmToMoveGoodsEntity t = wmToMoveGoodsService.get(WmToMoveGoodsEntity.class, wmToMoveGoods.getId());
try { try {
MyBeanUtils.copyBeanNotNull2Bean(wmToMoveGoods, t); MyBeanUtils.copyBeanNotNull2Bean(wmToMoveGoods, t);
try{
MvCusEntity mvcus = systemService.findUniqueByProperty(MvCusEntity.class, "cusCode",wmToMoveGoods.getToCusCode() ) ;
t.setToCusName(mvcus.getCusName());
}catch (Exception e){
}
wmToMoveGoodsService.saveOrUpdate(t); wmToMoveGoodsService.saveOrUpdate(t);
systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {

6
src/main/java/com/zzjee/wm/entity/WmImNoticeIEntity.java
View File

@ -100,7 +100,7 @@ public class WmImNoticeIEntity implements java.io.Serializable {
/**未清数量*/ /**未清数量*/
private java.lang.String goodsWqmCount; private java.lang.String goodsWqmCount;
/**收货登记数量*/ /**批量收货数量*/
private java.lang.String goodsQmCount; private java.lang.String goodsQmCount;
/**行项目状态*/ /**行项目状态*/
@ -529,7 +529,7 @@ public class WmImNoticeIEntity implements java.io.Serializable {
/** /**
*方法: 取得java.lang.String *方法: 取得java.lang.String
*@return: java.lang.String 收货登记数量 *@return: java.lang.String 批量收货数量
*/ */
@Column(name ="GOODS_QM_COUNT",nullable=true,length=32) @Column(name ="GOODS_QM_COUNT",nullable=true,length=32)
@ -539,7 +539,7 @@ public class WmImNoticeIEntity implements java.io.Serializable {
/** /**
*方法: 设置java.lang.String *方法: 设置java.lang.String
*@param: java.lang.String 收货登记数量 *@param: java.lang.String 批量收货数量
*/ */
public void setGoodsQmCount(java.lang.String goodsQmCount){ public void setGoodsQmCount(java.lang.String goodsQmCount){
this.goodsQmCount = goodsQmCount; this.goodsQmCount = goodsQmCount;

2
src/main/java/com/zzjee/wm/entity/WmInQmIEntity.java
View File

@ -20,7 +20,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
/** /**
* @Title: Entity * @Title: Entity
* @Description: 收货登记 * @Description: 批量收货
* @author erzhongxmu * @author erzhongxmu
* @date 2017-09-11 15:08:53 * @date 2017-09-11 15:08:53
* @version V1.0 * @version V1.0

2
src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java
View File

@ -69,7 +69,7 @@ public class SmsSendTask {
// TODO: handle exception // TODO: handle exception
} }
try {//查找储位 设置收货登记基本数量 try {//查找储位 设置批量收货基本数量
List<WmInQmIEntity> WmInQmlist = new ArrayList<WmInQmIEntity>(); List<WmInQmIEntity> WmInQmlist = new ArrayList<WmInQmIEntity>();
hql = null; hql = null;
hql = "from WmInQmIEntity t where t.binSta=? and (t.binId is null or t.binId = '' ) "; hql = "from WmInQmIEntity t where t.binSta=? and (t.binId is null or t.binId = '' ) ";

22
src/main/webapp/webpage/com/zzjee/wm/wmInQmI-add.jsp
View File

@ -5,7 +5,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>收货登记</title> <title>批量收货</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="online/template/ledefault/css/vendor.css"> <link rel="stylesheet" href="online/template/ledefault/css/vendor.css">
@ -73,8 +73,8 @@ window.onload = function() {
</head> </head>
<body> <body>
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="wmInQmIController.do?doAdd" tiptype="1" >
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="div" > <%--<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="div" >--%>
<input type="hidden" id="btn_sub" class="btn_sub"/> <input type="hidden" id="btn_sub" class="btn_sub"/>
<input type="hidden" id="id" name="id"/> <input type="hidden" id="id" name="id"/>
<input type="hidden" id="binSta" name="binSta" value="N"/> <input type="hidden" id="binSta" name="binSta" value="N"/>
@ -82,7 +82,7 @@ window.onload = function() {
<div class="tab-wrapper"> <div class="tab-wrapper">
<!-- tab --> <!-- tab -->
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li role="presentation" class="active"><a href="javascript:void(0);">收货登记</a></li> <li role="presentation" class="active"><a href="javascript:void(0);">批量收货</a></li>
</ul> </ul>
<!-- tab内容 --> <!-- tab内容 -->
<div class="con-wrapper" id="con-wrapper1" style="display: block;"> <div class="con-wrapper" id="con-wrapper1" style="display: block;">
@ -212,18 +212,18 @@ window.onload = function() {
</div> </div>
</div> </div>
<%--<div class="row" id = "sub_tr" style="display: none;">--%> <div class="row" id = "sub_tr" style="display: none;">
<%--<div class="col-xs-12 layout-header">--%> <div class="col-xs-12 layout-header">
<%--<div class="col-xs-6"></div>--%> <div class="col-xs-6"></div>
<%--<div class="col-xs-6"><button type="button" onclick="neibuClick();" class="btn btn-default">提交</button></div>--%> <div class="col-xs-6"><button type="button" onclick="neibuClick();" class="btn btn-default">提交</button></div>
<%--</div>--%> </div>
<%--</div>--%> </div>
</div> </div>
</div> </div>
<div class="con-wrapper" id="con-wrapper2" style="display: block;"></div> <div class="con-wrapper" id="con-wrapper2" style="display: block;"></div>
</div> </div>
<div style="margin:3px auto"><button onclick="sub('formobj');">验收</button></div> <%--<div style="margin:3px auto"><button onclick="sub('formobj');">验收</button></div>--%>
</t:formvalid> </t:formvalid>

4
src/main/webapp/webpage/com/zzjee/wm/wmInQmI-update.jsp
View File

@ -5,7 +5,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>收货登记</title> <title>批量收货</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="online/template/ledefault/css/vendor.css"> <link rel="stylesheet" href="online/template/ledefault/css/vendor.css">
@ -53,7 +53,7 @@
<div class="tab-wrapper"> <div class="tab-wrapper">
<!-- tab --> <!-- tab -->
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li role="presentation" class="active"><a href="javascript:void(0);">收货登记</a></li> <li role="presentation" class="active"><a href="javascript:void(0);">批量收货</a></li>
</ul> </ul>
<!-- tab内容 --> <!-- tab内容 -->
<div class="con-wrapper" id="con-wrapper1" style="display: block;"> <div class="con-wrapper" id="con-wrapper1" style="display: block;">

2
src/main/webapp/webpage/com/zzjee/wm/wmInQmIList.jsp
View File

@ -6,7 +6,7 @@
<script type="text/javascript" src="plug-in/jquery/jquery-autocomplete/jquery.autocomplete.min.js"></script> <script type="text/javascript" src="plug-in/jquery/jquery-autocomplete/jquery.autocomplete.min.js"></script>
<div class="easyui-layout" fit="true"> <div class="easyui-layout" fit="true">
<div region="center" style="padding:0px;border:0px"> <div region="center" style="padding:0px;border:0px">
<t:datagrid name="wmInQmIList" checkbox="true" pagination="true" fitColumns="false" title="收货登记" actionUrl="wmInQmIController.do?datagrid" idField="id" fit="false" queryMode="group"> <t:datagrid name="wmInQmIList" checkbox="true" pagination="true" fitColumns="false" title="批量收货" actionUrl="wmInQmIController.do?datagrid" idField="id" fit="false" queryMode="group">
<t:dgCol title="操作" field="opt" width="120"></t:dgCol> <t:dgCol title="操作" field="opt" width="120"></t:dgCol>
<t:dgCol title="主键" field="id" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="主键" field="id" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="验收人" field="createName" queryMode="single" width="80"></t:dgCol> <t:dgCol title="验收人" field="createName" queryMode="single" width="80"></t:dgCol>

38
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-add.jsp
View File

@ -484,26 +484,26 @@
typeGroupCode="sf_yn" hasLabel="false" title="下架任务是否已生成"></t:dictSelect> typeGroupCode="sf_yn" hasLabel="false" title="下架任务是否已生成"></t:dictSelect>
<label class="Validform_label" style="display: none;">下架任务是否已生成</label> <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
</td> </td>
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[#index#].binOm" maxlength="32" <%--<input name="wmOmNoticeIList[#index#].binOm" maxlength="32"--%>
ignore="ignore" <%--ignore="ignore"--%>
type="text" class="form-control" style="width:120px;" > <%--type="text" class="form-control" style="width:120px;" >--%>
<label class="Validform_label" style="display: none;">出货储位</label> <%--<label class="Validform_label" style="display: none;">出货储位</label>--%>
</td> <%--</td>--%>
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[#index#].binId" maxlength="32" <%--<input name="wmOmNoticeIList[#index#].binId" maxlength="32"--%>
ignore="ignore" <%--ignore="ignore"--%>
type="text" class="form-control" style="width:120px;" > <%--type="text" class="form-control" style="width:120px;" >--%>
<label class="Validform_label" style="display: none;">出货托盘</label> <%--<label class="Validform_label" style="display: none;">出货托盘</label>--%>
</td> <%--</td>--%>
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[#index#].goodsProData" maxlength="32" <%--<input name="wmOmNoticeIList[#index#].goodsProData" maxlength="32"--%>
type="text" class="form-control" onClick="WdatePicker()" style="background: url('plug-in/ace/images/datetime.png') no-repeat scroll right center transparent;width:160px;" <%--type="text" class="form-control" onClick="WdatePicker()" style="background: url('plug-in/ace/images/datetime.png') no-repeat scroll right center transparent;width:160px;"--%>
ignore="ignore" <%--ignore="ignore"--%>
> <%-->--%>
<label class="Validform_label" style="display: none;">生产日期</label> <%--<label class="Validform_label" style="display: none;">生产日期</label>--%>
</td> <%--</td>--%>
</tr> </tr>
</tbody> </tbody>
</table> </table>

39
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-update.jsp
View File

@ -308,6 +308,7 @@
<div class="col-xs-1 text-center"> <div class="col-xs-1 text-center">
<b>附件</b> <b>附件</b>
</div> </div>
</div>
<div class="col-xs-2"> <div class="col-xs-2">
<t:webUploader auto="true" pathValues="${wmOmNoticeHPage.fuJian}" name="fuJian" duplicate="true" fileNumLimit="3"></t:webUploader> <t:webUploader auto="true" pathValues="${wmOmNoticeHPage.fuJian}" name="fuJian" duplicate="true" fileNumLimit="3"></t:webUploader>
@ -478,26 +479,26 @@
typeGroupCode="sf_yn" hasLabel="false" title="下架任务是否已生成"></t:dictSelect> typeGroupCode="sf_yn" hasLabel="false" title="下架任务是否已生成"></t:dictSelect>
<label class="Validform_label" style="display: none;">下架任务是否已生成</label> <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
</td> </td>
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[#index#].binOm" maxlength="32" <%--<input name="wmOmNoticeIList[#index#].binOm" maxlength="32"--%>
ignore="ignore" <%--ignore="ignore"--%>
type="text" class="form-control" style="width:120px;" > <%--type="text" class="form-control" style="width:120px;" >--%>
<label class="Validform_label" style="display: none;">出货储位</label> <%--<label class="Validform_label" style="display: none;">出货储位</label>--%>
</td> <%--</td>--%>
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[#index#].binId" maxlength="32" <%--<input name="wmOmNoticeIList[#index#].binId" maxlength="32"--%>
ignore="ignore" <%--ignore="ignore"--%>
type="text" class="form-control" style="width:120px;" > <%--type="text" class="form-control" style="width:120px;" >--%>
<label class="Validform_label" style="display: none;">出货托盘</label> <%--<label class="Validform_label" style="display: none;">出货托盘</label>--%>
</td> <%--</td>--%>
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[#index#].goodsProData" maxlength="32" <%--<input name="wmOmNoticeIList[#index#].goodsProData" maxlength="32"--%>
type="text" class="form-control" onClick="WdatePicker()" style="background: url('plug-in/ace/images/datetime.png') no-repeat scroll right center transparent;width:160px;" <%--type="text" class="form-control" onClick="WdatePicker()" style="background: url('plug-in/ace/images/datetime.png') no-repeat scroll right center transparent;width:160px;"--%>
ignore="ignore" <%--ignore="ignore"--%>
> <%-->--%>
<label class="Validform_label" style="display: none;">生产日期</label> <%--<label class="Validform_label" style="display: none;">生产日期</label>--%>
</td> <%--</td>--%>
</tr> </tr>
</tbody> </tbody>
</table> </table>

78
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeIList.jsp
View File

@ -96,15 +96,15 @@
<th> <th>
下架任务是否已生成 下架任务是否已生成
</th> </th>
<th> <%--<th>--%>
出货储位 <%--出货储位--%>
</th> <%--</th>--%>
<th> <%--<th>--%>
出货托盘 <%--出货托盘--%>
</th> <%--</th>--%>
<th> <%--<th>--%>
生产日期 <%--生产日期--%>
</th> <%--</th>--%>
</tr> </tr>
</thead> </thead>
@ -133,22 +133,22 @@
<label class="Validform_label" style="display: none;">下架任务是否已生成</label> <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
</td> </td>
<td> <%--<td>--%>
<input name="wmOmNoticeIList[0].binOm" maxlength="32" <%--<input name="wmOmNoticeIList[0].binOm" maxlength="32"--%>
type="text" class="form-control" style="width:120px;" > <%--type="text" class="form-control" style="width:120px;" >--%>
<label class="Validform_label" style="display: none;">出货储位</label> <%--<label class="Validform_label" style="display: none;">出货储位</label>--%>
</td> <%--</td>--%>
<td> <%--<td>--%>
<input name="wmOmNoticeIList[0].binId" maxlength="32" <%--<input name="wmOmNoticeIList[0].binId" maxlength="32"--%>
type="text" class="form-control" style="width:120px;" > <%--type="text" class="form-control" style="width:120px;" >--%>
<label class="Validform_label" style="display: none;">出货托盘</label> <%--<label class="Validform_label" style="display: none;">出货托盘</label>--%>
</td> <%--</td>--%>
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[0].goodsProData" maxlength="32" <%--<input name="wmOmNoticeIList[0].goodsProData" maxlength="32"--%>
type="text" class="form-control" onClick="WdatePicker()" style="background: url('plug-in/ace/images/datetime.png') no-repeat scroll right center transparent;width:160px;" > <%--type="text" class="form-control" onClick="WdatePicker()" style="background: url('plug-in/ace/images/datetime.png') no-repeat scroll right center transparent;width:160px;" >--%>
<label class="Validform_label" style="display: none;">生产日期</label> <%--<label class="Validform_label" style="display: none;">生产日期</label>--%>
</td> <%--</td>--%>
</tr> </tr>
@ -208,26 +208,26 @@ wmOmNoticeIList[${stuts.index }].goodsId<input name="wmOmNoticeIList[${stuts.ind
typeGroupCode="sf_yn" defaultVal="${poVal.planSta}" hasLabel="false" title="下架任务是否已生成"></t:dictSelect> typeGroupCode="sf_yn" defaultVal="${poVal.planSta}" hasLabel="false" title="下架任务是否已生成"></t:dictSelect>
<label class="Validform_label" style="display: none;">下架任务是否已生成</label> <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
</td> </td>
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[${stuts.index }].binOm" maxlength="32" <%--<input name="wmOmNoticeIList[${stuts.index }].binOm" maxlength="32"--%>
type="text" class="form-control" style="width:120px;" value="${poVal.binOm }"> <%--type="text" class="form-control" style="width:120px;" value="${poVal.binOm }">--%>
<label class="Validform_label" style="display: none;">出货储位</label> <%--<label class="Validform_label" style="display: none;">出货储位</label>--%>
</td> <%--</td>--%>
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[${stuts.index }].binId" maxlength="32" <%--<input name="wmOmNoticeIList[${stuts.index }].binId" maxlength="32"--%>
type="text" class="form-control" style="width:120px;" value="${poVal.binId }"> <%--type="text" class="form-control" style="width:120px;" value="${poVal.binId }">--%>
<label class="Validform_label" style="display: none;">出货托盘</label> <%--<label class="Validform_label" style="display: none;">出货托盘</label>--%>
</td> <%--</td>--%>
<!-- <td align="left"> --> <!-- <td align="left"> -->
<%-- <input name="wmOmNoticeIList[${stuts.index }].goodsQuaok" maxlength="32" --%> <%-- <input name="wmOmNoticeIList[${stuts.index }].goodsQuaok" maxlength="32" --%>
<%-- type="text" class="form-control" style="width:120px;" value="${poVal.goodsQuaok }"> --%> <%-- type="text" class="form-control" style="width:120px;" value="${poVal.goodsQuaok }"> --%>
<!-- <label class="Validform_label" style="display: none;">已经出货数量</label> --> <!-- <label class="Validform_label" style="display: none;">已经出货数量</label> -->
<!-- </td> --> <!-- </td> -->
<td align="left"> <%--<td align="left">--%>
<input name="wmOmNoticeIList[${stuts.index }].goodsProData" maxlength="32" <%--<input name="wmOmNoticeIList[${stuts.index }].goodsProData" maxlength="32"--%>
type="text" class="form-control" onClick="WdatePicker()" style="background: url('plug-in/ace/images/datetime.png') no-repeat scroll right center transparent;width:160px;" value="<fmt:formatDate value='${poVal.goodsProData}' type="date" pattern="yyyy-MM-dd"/>"> <%--type="text" class="form-control" onClick="WdatePicker()" style="background: url('plug-in/ace/images/datetime.png') no-repeat scroll right center transparent;width:160px;" value="<fmt:formatDate value='${poVal.goodsProData}' type="date" pattern="yyyy-MM-dd"/>">--%>
<label class="Validform_label" style="display: none;">生产日期</label> <%--<label class="Validform_label" style="display: none;">生产日期</label>--%>
</td> <%--</td>--%>
<!-- <td align="left"> --> <!-- <td align="left"> -->
<%-- <input name="wmOmNoticeIList[${stuts.index }].binOm" maxlength="32" --%> <%-- <input name="wmOmNoticeIList[${stuts.index }].binOm" maxlength="32" --%>
<%-- type="text" class="form-control" style="width:120px;" value="${poVal.binOm }"> --%> <%-- type="text" class="form-control" style="width:120px;" value="${poVal.binOm }"> --%>

25
src/main/webapp/webpage/com/zzjee/wm/wmToMoveGoods-update.jsp
View File

@ -250,6 +250,9 @@
<b>转移客户：</b> <b>转移客户：</b>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<t:dictSelect field="toCusCode" type="list" extendJson=" {class:'form-control',datatype:'*',style:'width:230px'}"
defaultVal="${wmToMoveGoodsPage.toCusCode}" dictTable="mv_cus" dictField="cus_code" dictText="cus_name" hasLabel="false" title="客户编码"></t:dictSelect>
<
<input id="toCusCode" name="toCusCode" type="text" class="form-control" <input id="toCusCode" name="toCusCode" type="text" class="form-control"
ignore="ignore" ignore="ignore"
value='${wmToMoveGoodsPage.toCusCode}' /> value='${wmToMoveGoodsPage.toCusCode}' />
@ -259,17 +262,17 @@
</div> </div>
<div class="row show-grid"> <%--<div class="row show-grid">--%>
<div class="col-xs-3 text-center"> <%--<div class="col-xs-3 text-center">--%>
<b>转移客户名称：</b> <%--<b>转移客户名称：</b>--%>
</div> <%--</div>--%>
<div class="col-xs-3"> <%--<div class="col-xs-3">--%>
<input id="toCusName" name="toCusName" style="width:300px" type="text" class="form-control" <%--<input id="toCusName" name="toCusName" style="width:300px" type="text" class="form-control"--%>
ignore="ignore" <%--ignore="ignore"--%>
value='${wmToMoveGoodsPage.toCusName}' /> <%--value='${wmToMoveGoodsPage.toCusName}' />--%>
<span class="Validform_checktip" style="float:left;height:0px;"></span> <%--<span class="Validform_checktip" style="float:left;height:0px;"></span>--%>
<label class="Validform_label" style="display: none">转移客户名称</label> <%--<label class="Validform_label" style="display: none">转移客户名称</label>--%>
</div> <%--</div>--%>
</div> </div>

9
src/main/webapp/webpage/com/zzjee/wm/wminqmbatchList.jsp
View File

@ -3,7 +3,7 @@
<t:base type="jquery,easyui,tools,DatePicker"></t:base> <t:base type="jquery,easyui,tools,DatePicker"></t:base>
<div class="easyui-layout" fit="true"> <div class="easyui-layout" fit="true">
<div region="center" style="padding:0px;border:0px"> <div region="center" style="padding:0px;border:0px">
<t:datagrid name="wmInQmIbatchList" checkbox="true" pagination="false" fitColumns="false" title="收货登记" actionUrl="wmImNoticeHController.do?datagridbatch" idField="id" fit="true" queryMode="group"> <t:datagrid name="wmInQmIbatchList" checkbox="true" pagination="false" fitColumns="false" title="批量收货" actionUrl="wmImNoticeHController.do?datagridbatch" idField="id" fit="true" queryMode="group">
<t:dgCol title="操作" field="opt" width="50"></t:dgCol> <t:dgCol title="操作" field="opt" width="50"></t:dgCol>
<t:dgCol title="主键" field="id" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="主键" field="id" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="创建人名称" field="createName" queryMode="single" width="80"></t:dgCol> <t:dgCol title="创建人名称" field="createName" queryMode="single" width="80"></t:dgCol>
@ -42,9 +42,12 @@
// createdetailwindow() // createdetailwindow()
// function addbytab(){ // function addbytab(){
addOneTab("验收", url); // addOneTab("验收", url);
createwindow("验收", url,"740px","420px");
// } // }
// add('收货登记', url, "wmInQmIbatchList","100%","100%"); // add('批量收货', url, "wmInQmIbatchList","100%","100%");
} }
//导入 //导入
function ImportXls() { function ImportXls() {

4
src/main/webapp/webpage/com/zzjee/wm/wmintqmbatchList.jsp
View File

@ -41,7 +41,9 @@ function wmim(id) {
// createdetailwindow() // createdetailwindow()
// function addbytab(){ // function addbytab(){
addOneTab("退货验收", url); createwindow("退货验收", url,"740px","420px");
// addOneTab("退货验收", url);
// var url = "wmInQmIController.do?goAddBatch&id=" + id; // var url = "wmInQmIController.do?goAddBatch&id=" + id;
// add('退货登记', url, "wmInQmIbatchList","680","450"); // add('退货登记', url, "wmInQmIbatchList","680","450");
} }