|
|
@@ -1,7 +1,9 @@
|
|
|
ALTER TABLE `bigpartpurchase`
|
|
|
ADD COLUMN `purchase_type` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '申购类型 0 正常 1 暂估 2 垫付 3 赠品',
|
|
|
ADD COLUMN `funder_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '垫资人id',
|
|
|
- ADD COLUMN `providerName` varchar(255) NOT NULL DEFAULT '' COMMENT '供应商名称';
|
|
|
+ ADD COLUMN `providerName` varchar(255) NOT NULL DEFAULT '' COMMENT '供应商名称',
|
|
|
+ ADD COLUMN `financeId` int(11) DEFAULT NULL COMMENT '财务审核id',
|
|
|
+ ADD COLUMN `financedate` datetime DEFAULT NULL COMMENT '财务审核时间';
|
|
|
|
|
|
|
|
|
ALTER TABLE `bigpartuse` ADD COLUMN greenFodderNumber varchar(255) NOT NULL DEFAULT '' COMMENT '青贮单号';
|
|
|
@@ -1055,12 +1057,6 @@ WHERE (
|
|
|
)
|
|
|
ORDER BY bpu.receiveTime DESC,bpu.id desc;
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
-
|
|
|
-ALTER TABLE `bigpartpurchase` ADD COLUMN `financeId` int(11) DEFAULT NULL COMMENT '财务审核id';
|
|
|
-ALTER TABLE `bigpartpurchase` ADD COLUMN `financedate` datetime DEFAULT NULL COMMENT '财务审核时间';
|
|
|
-ALTER TABLE `bigbuydetail` ADD COLUMN `providerName` varchar(255) NOT NULL DEFAULT '' COMMENT '供应商名称';
|
|
|
-=======
|
|
|
# SELECT * FROM apisql WHERE sqlname = 'getBigStockLaidList' 备件入库显示申购状态
|
|
|
select t.*,t2.countnum partKind from
|
|
|
(SELECT
|
|
|
@@ -1127,4 +1123,3 @@ select t.*,t2.countnum partKind from
|
|
|
)t
|
|
|
left join (SELECT bigid,COUNT(bigid) countnum FROM partlaid pl group by bigid )t2 on t.id =t2.bigid
|
|
|
ORDER by t.storageTime DESC,t.id desc;
|
|
|
->>>>>>> f39d9f4961cfacefa118cf57cd7ccaf3b553a1ed
|
Yi