--------------

update Sys_TableColumn set ColumnCNName = REPLACE(ColumnCNName,'法定单位','申报计量单位')
 where ColumnCNName like '%法定%'

update Sys_TableColumn set ColumnCNName = REPLACE(ColumnCNName,'法定数量','申报单位数量')
 where ColumnCNName like '%法定%'

-------------------

alter table OP_WMS_FEERATE_DETAIL add ENDPRICE numeric(18,3) null
GO

alter table OP_WMS_FEERATE_DETAIL add REMARK varchar(200) null
GO

alter table OP_WMS_FEERATE_DETAIL add INPUTMODE varchar(40) null
GO

--------------------------------

ALTER VIEW [dbo].[VW_OP_WMS_OUT_PLANDETAIL_PHYSICS]
AS
SELECT   D.WMSOUTDETAILID, D.WMSPLANID, 
                D.WMSID, D.MBLNO, 
                D.CNTRNO, D.MATERIALNO, 
                D.GOODSCODE, D.GOODSNAME, 
                D.GOODSHSCODE, D.KGS, D.NETWEIGHT, 
                D.PKGS, D.CBM, 
                D.KINDPKGS, D.STORAGEUNIT, 
                D.STORAGEUNITCOUNT, D.RULEUNIT, 
                D.RULEUNITCOUNT, pc.STOREHOUSE, 
                pc.AREACODE, pc.PKGS AS PKGS1,pc.WMSPHYSICSID
FROM      OP_WMS_OUT_PLAN_DETAIL D
			left JOIN dbo.OP_WMS_PHYSICS pc ON 
			(D.WMSID = pc.WMSID and pc.STORAGEUNITCOUNT>0) or (D.WMSPHYSICSID=pc.WMSPHYSICSID and pc.STORAGEUNITCOUNT>0)
GO
			---------------------------------
-----

set identity_insert [Sys_Dictionary] on

INSERT INTO [dbo].[Sys_Dictionary]([Dic_ID], [Config], [CreateDate], [CreateID], [Creator], [DBServer], [DbSql], [DicName], [DicNo], [Enable], [Modifier], [ModifyDate], [ModifyID], [OrderNo], [ParentId], [Remark], [CompanyField]) VALUES (145, NULL, '2021-05-28 23:29:09.000', '7A3CE389-FA53-4640-88D4-6A16651F9458', N'冯夏青', NULL, N' select STATEKEY as ''key'',[NAME] as ''value'' from [sys_task_execution] ', N'任务动作', N'execution', 1, N'冯夏青', '2021-05-29 00:46:06.517', '7A3CE389-FA53-4640-88D4-6A16651F9458', 500, 0, NULL, NULL)
GO

INSERT INTO [dbo].[Sys_Dictionary]([Dic_ID], [Config], [CreateDate], [CreateID], [Creator], [DBServer], [DbSql], [DicName], [DicNo], [Enable], [Modifier], [ModifyDate], [ModifyID], [OrderNo], [ParentId], [Remark], [CompanyField]) VALUES (150, NULL, '2021-07-15 10:29:58.000', '7A3CE389-FA53-4640-88D4-6A16651F9458', N'冯夏青', NULL, N'select GID as ''key'',Name as ''value'' from wms_stevedores where ##companyfield=''##companyvalue''', N'装卸工', N'zhuangxiegong', 1, N'冯夏青', '2021-07-15 10:30:00.943', '7A3CE389-FA53-4640-88D4-6A16651F9458', NULL, 0, NULL, 'CORPID')
GO
set identity_insert [Sys_Dictionary] off

set identity_insert [Sys_DictionaryList] on

INSERT INTO [dbo].[Sys_DictionaryList]([DicList_ID], [CreateDate], [CreateID], [Creator], [DicName], [DicValue], [Dic_ID], [Enable], [Modifier], [ModifyDate], [ModifyID], [OrderNo], [Remark]) VALUES (464, '2021-07-02 17:22:00.090', '7A3CE389-FA53-4640-88D4-6A16651F9458', N'冯夏青', N'仓储审核', N'仓储审核', 146, 0, NULL, NULL, '00000000-0000-0000-0000-000000000000', NULL, NULL)

set identity_insert [Sys_DictionaryList] off

UPDATE [dbo].[Sys_Dictionary] SET [Config] = NULL, [CreateDate] = '2020-08-19 11:35:52.000', [CreateID] = '1BEC90E1-9780-472F-90C2-0C6390C044A4', [Creator] = N'系统管理员', [DBServer] = NULL, [DbSql] = N'select SHOWNAME as value  , SHOWNAME  [key] from vw_user where ##companyfield=''##companyvalue''
', [DicName] = N'用户', [DicNo] = N'user', [Enable] = 1, [Modifier] = N'冯夏青', [ModifyDate] = '2021-05-27 15:49:45.070', [ModifyID] = '7A3CE389-FA53-4640-88D4-6A16651F9458', [OrderNo] = NULL, [ParentId] = 0, [Remark] = NULL, [CompanyField] = 'COMPANYID' WHERE [Dic_ID] = 71
GO

UPDATE [dbo].[Sys_Dictionary] SET [Config] = NULL, [CreateDate] = '2020-09-02 10:52:14.000', [CreateID] = '1BEC90E1-9780-472F-90C2-0C6390C044A4', [Creator] = N'系统管理员', [DBServer] = NULL, [DbSql] = N' select SHORTNAME as ''key'',CODENAME + '''' + SHORTNAME as ''value'' FROM info_Client where ##companyfield=''##companyvalue'' order by ''value'' ', [DicName] = N'客户名称', [DicNo] = N'CustName', [Enable] = 1, [Modifier] = N'冯夏青', [ModifyDate] = '2021-05-27 15:56:33.587', [ModifyID] = '7A3CE389-FA53-4640-88D4-6A16651F9458', [OrderNo] = NULL, [ParentId] = 0, [Remark] = NULL, [CompanyField] = 'CORPID' WHERE [Dic_ID] = 81
GO

UPDATE [dbo].[Sys_Dictionary] SET [Config] = NULL, [CreateDate] = '2021-03-18 17:54:09.000', [CreateID] = '7A3CE389-FA53-4640-88D4-6A16651F9458', [Creator] = N'冯夏青', [DBServer] = NULL, [DbSql] = N'SELECT GOODNAME as ''key'',isnull((select top 1 STORAGEUNIT_TYPE from OP_WMS_GOODSFEETYPE where GOODSFEETYPE=code_goods.GOODSFEETYPE),''毛重'') as ''value'' FROM code_goods', [DicName] = N'商品默认计费类型', [DicNo] = N'codegoods_storageunit_type', [Enable] = 1, [Modifier] = N'冯夏青', [ModifyDate] = '2021-06-16 09:44:59.560', [ModifyID] = '7A3CE389-FA53-4640-88D4-6A16651F9458', [OrderNo] = NULL, [ParentId] = 0, [Remark] = NULL, [CompanyField] = NULL WHERE [Dic_ID] = 140
GO

UPDATE [dbo].[Sys_Dictionary] SET [Config] = NULL, [CreateDate] = '2021-07-02 17:23:08.000', [CreateID] = '7A3CE389-FA53-4640-88D4-6A16651F9458', [Creator] = N'冯夏青', [DBServer] = NULL, [DbSql] = N'select SHOWNAME as value  , USERID  [key] from vw_user where ##companyfield=''##companyvalue'' and userid in(select user_id from Vw_Sys_User where RoleName in (select DicName from Sys_DictionaryList where dic_id=(select dic_id from Sys_Dictionary where DicNo =''StorageOpRoleName'')))', [DicName] = N'库管', [DicNo] = N'StorageOp', [Enable] = 1, [Modifier] = N'冯夏青', [ModifyDate] = '2021-07-02 17:33:44.293', [ModifyID] = '7A3CE389-FA53-4640-88D4-6A16651F9458', [OrderNo] = NULL, [ParentId] = 0, [Remark] = NULL, [CompanyField] = NULL WHERE [Dic_ID] = 147