|
|
@@ -232,4 +232,210 @@ WHERE bc.`pastureId`=? AND bc.`providerId` = ? AND bc.`stopTime`=? AND bc.`flag`
|
|
|
c.specification LIKE CONCAT("%", ?, "%")
|
|
|
OR ? = ''
|
|
|
)
|
|
|
-ORDER BY c.partCode
|
|
|
+ORDER BY c.partCode;
|
|
|
+
|
|
|
+
|
|
|
+# SELECT * FROM apisql WHERE sqlname = "insertDiesel
|
|
|
+INSERT INTO diesel (pastureId,selTime,oilClass,oilAmount,eqId,eqCode,deptId,note,nowPrice,oilcardId,cardNumber,price,empId,inputId,oilType,oilName)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);
|
|
|
+# pastureId,selTime,oilClass,oilAmount,eqId,eqCode,departmentId,note,nowPrice,oilcardId,cardNumber,price,empId,inputId,oilType,oilName
|
|
|
+
|
|
|
+ALTER TABLE `diesel`
|
|
|
+ ADD COLUMN `oilType` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '柴油类型 0: 空 1: 0# 2: -10# 3: -20# 4: -30# 5: -35#',
|
|
|
+ ADD COLUMN `oilName` varchar(255) NOT NULL DEFAULT '' COMMENT '柴油类型名称';
|
|
|
+
|
|
|
+# SELECT * FROM apisql WHERE sqlname = "updateDieselExecData"
|
|
|
+update diesel
|
|
|
+set oilAmount= ?,
|
|
|
+ note = ?,
|
|
|
+ nowPrice = ?,
|
|
|
+ price=?,
|
|
|
+ oilType = ?,
|
|
|
+ oilName = ?
|
|
|
+where id = ?;
|
|
|
+# oilAmount, note, nowPrice, price,oilType,oilName, id
|
|
|
+
|
|
|
+# SELECT * FROM apisql WHERE sqlname = "getDieselList"
|
|
|
+SELECT (@i:=@i+1) i,d.id,d.oilcardId,p.name pastureName,dp.name departName, d.cardNumber,o.cardType ,DATE_FORMAT(d.selTime,'%Y-%m-%d') as selTime,a.eqCode as assetNumber ,a.eqName assetName,d.empId employName,d.oilClass,d.empId,
|
|
|
+d.oilName,
|
|
|
+d.oilAmount,d.price,d.nowPrice,d.note,ff.empname empname,d.inputId
|
|
|
+from (SELECT @i:=0) AS i,diesel d
|
|
|
+LEFT JOIN oilcard o ON d.oilcardId = o.id
|
|
|
+INNER JOIN pasture p on d.pastureId = p.id
|
|
|
+left JOIN department dp on d.deptId= dp.id
|
|
|
+LEFT JOIN emp ff ON d.inputId = ff.id
|
|
|
+LEFT JOIN equipment a ON a.id= o.eqId
|
|
|
+where (p.name like concat("%",?,"%") or ? ='现代牧业')
|
|
|
+ and (dp.name like concat("%",?,"%") or ? ='')
|
|
|
+ and (d.cardNumber like concat("%",?,"%") or ? ='')
|
|
|
+ and (o.cardCode like concat("%",?,"%") or ? ='')
|
|
|
+ AND (a.eqCode like concat("%",?,"%") or ? ='') AND (a.eqName like concat("%",?,"%") or ? ='')
|
|
|
+ AND (d.empId like concat("%",?,"%") or ? ='') AND (d.oilClass like concat("%",?,"%") or ? ='')
|
|
|
+ and (d.selTime between ? and ? or ?='')
|
|
|
+ORDER BY d.selTime DESC,d.id DESC;
|
|
|
+
|
|
|
+# SELECT * FROM apisql WHERE sqlname = "getPartuseDetailList" // 备件出库-出库记录查询修改备件名称模糊查询
|
|
|
+SELECT
|
|
|
+ e1.`empname`,
|
|
|
+ d.`name` AS departmentName,
|
|
|
+ bpu.`listType`,
|
|
|
+ bpu.`useForm`,
|
|
|
+ IFNULL(pv.`providerName`,(SELECT provider.providerName FROM part_repertory
|
|
|
+ INNER JOIN provider ON provider.id = part_repertory.providerId
|
|
|
+ WHERE part_repertory.contractId = pu.contractId LIMIT 1)) providerName,
|
|
|
+ w.`warehoseCode`,
|
|
|
+ pu.`partCode`,
|
|
|
+ pu.`partName`,
|
|
|
+ b.`brandName`,
|
|
|
+ pu.`specification`,
|
|
|
+ pu.`unit`,
|
|
|
+ (pu.`checkoutNumber`-pu.`quitNumber`) checkoutNumber,
|
|
|
+ TRIM(TRAILING '.' FROM (TRIM(TRAILING '0' FROM pu.`price`))) price,
|
|
|
+ round( TRIM(TRAILING '.' FROM (TRIM(TRAILING '0' FROM pu.`price`)))*(pu.`checkoutNumber`-pu.`quitNumber`) ,2)sumPrice,
|
|
|
+ pu.`eqName`,
|
|
|
+ pu.`eqCode`,
|
|
|
+ pu.useTypeV,
|
|
|
+ pu.reportery,
|
|
|
+ p.`name` pastureName,
|
|
|
+ e.empname AS appliname,
|
|
|
+ e.id employeId,
|
|
|
+ DATE_FORMAT(bpu.receiveTime, '%Y/%m/%d') creatTime,pu.note
|
|
|
+FROM
|
|
|
+ partuse pu
|
|
|
+ inner JOIN bigpartuse bpu
|
|
|
+ ON pu.`bigId` =bpu.`id`
|
|
|
+ LEFT JOIN pasture p
|
|
|
+ ON p.id = bpu.pastureId
|
|
|
+ LEFT JOIN emp e
|
|
|
+ ON e.id = bpu.applicatId
|
|
|
+ LEFT JOIN emp e1
|
|
|
+ ON e1.id = bpu.`empId`
|
|
|
+ LEFT JOIN department d
|
|
|
+ ON d.id = bpu.`departmentId`
|
|
|
+ LEFT JOIN contract c
|
|
|
+ ON c.`id` = pu.`contractId`
|
|
|
+ LEFT JOIN bigcontract bc
|
|
|
+ ON bc.`id` = c.`bigId`
|
|
|
+ LEFT JOIN provider pv
|
|
|
+ ON bc.`providerId` = pv.`id`
|
|
|
+ LEFT JOIN warehouse w
|
|
|
+ ON w.id = pu.locationId
|
|
|
+ LEFT JOIN brand b
|
|
|
+ ON b.id = pu.brandId
|
|
|
+
|
|
|
+WHERE (
|
|
|
+ bpu.useForm LIKE CONCAT("%", ?, "%")
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ bpu.`useType` = ?
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ (bpu.receiveTime >= ? AND bpu.receiveTime <= ?)
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ p.`name` = ?
|
|
|
+ OR ? = '现代牧业'
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ d.`id` =?
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ pu.partCode=?
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ pu.partName like concat("%",?,"%") or ? =''
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ bc.`providerId`=?
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ pu.`eqName`=?
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+
|
|
|
+ AND (
|
|
|
+ if(?='',
|
|
|
+ ''='',
|
|
|
+ (select assetCode from equipment where equipment.eqcode = pu.eqcode) like concat(?,'%')
|
|
|
+ )
|
|
|
+ )
|
|
|
+ORDER BY bpu.receiveTime DESC,bpu.id desc;
|
|
|
+
|
|
|
+
|
|
|
+SELECT (@i:=@i+1) i,d.id,d.oilcardId,p.name pastureName,dp.name departName, d.cardNumber,o.cardType ,DATE_FORMAT(d.selTime,'%Y-%m-%d') as selTime,a.eqCode as assetNumber ,a.eqName assetName,d.empId employName,d.oilClass,d.empId,
|
|
|
+ d.oilName,
|
|
|
+ d.oilAmount,d.price,d.nowPrice,d.note,ff.empname empname,d.inputId
|
|
|
+from (SELECT @i:=0) AS i,diesel d
|
|
|
+ LEFT JOIN oilcard o ON d.oilcardId = o.id
|
|
|
+ INNER JOIN pasture p on d.pastureId = p.id
|
|
|
+ left JOIN department dp on d.deptId= dp.id
|
|
|
+ LEFT JOIN emp ff ON d.inputId = ff.id
|
|
|
+ LEFT JOIN equipment a ON a.id= o.eqId
|
|
|
+where (p.name like concat("%",?,"%") or ? ='现代牧业')
|
|
|
+
|
|
|
+ and (dp.name like concat("%",?,"%") or ? ='')
|
|
|
+ and (d.cardNumber like concat("%",?,"%") or ? ='')
|
|
|
+ and (o.cardCode like concat("%",?,"%") or ? ='')
|
|
|
+ AND (a.eqCode like concat("%",?,"%") or ? ='') AND (a.eqName like concat("%",?,"%") or ? ='')
|
|
|
+ AND (d.empId like concat("%",?,"%") or ? ='') AND (d.oilClass like concat("%",?,"%") or ? ='')
|
|
|
+ and (d.selTime between ? and ? or ?='')
|
|
|
+ORDER BY d.selTime DESC,d.id DESC;
|
|
|
+
|
|
|
+
|
|
|
+# SELECT * FROM apisql WHERE sqlname = "getPartlaideDetailList" // 备件入库-入库记录查询修改备件名称模糊查询
|
|
|
+SELECT
|
|
|
+ emp.empname,
|
|
|
+ b.`brandName`,
|
|
|
+ w.`warehoseCode`,
|
|
|
+ pv.`providerName`,
|
|
|
+ DATE_FORMAT(bpl.storageTime, '%Y/%m/%d') creatTime,
|
|
|
+ p.`name` pastureName,
|
|
|
+ bpl.`laidCode`,
|
|
|
+ pl.`partCode`,
|
|
|
+ pl.`partName`,
|
|
|
+ pl.`specification`,
|
|
|
+ pl.`unit`,
|
|
|
+ pl.storageAmount,
|
|
|
+ TRIM(TRAILING '.' FROM (TRIM(TRAILING '0' FROM pl.`price`))) price ,
|
|
|
+ TRIM(TRAILING '.' FROM (TRIM(TRAILING '0' FROM pl.`sumPrice`))) sumPrice
|
|
|
+FROM
|
|
|
+ partlaid pl
|
|
|
+ inner JOIN bigpartlaid bpl
|
|
|
+ ON bpl.`id` = pl.`bigId`
|
|
|
+ LEFT JOIN brand b
|
|
|
+ ON b.id = pl.brandId
|
|
|
+ LEFT JOIN warehouse w
|
|
|
+ ON w.id = pl.locationId
|
|
|
+ LEFT JOIN pasture p
|
|
|
+ ON p.id = bpl.`pastureId`
|
|
|
+ left JOIN provider pv
|
|
|
+ ON pv.id = pl.`providerId`
|
|
|
+ left join emp
|
|
|
+ on emp.id = bpl.empId
|
|
|
+WHERE (
|
|
|
+ bpl.laidCode LIKE CONCAT("%", ?, "%")
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ p.`name` LIKE CONCAT("%", ?, "%")
|
|
|
+ OR ? = '现代牧业'
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ (bpl.storageTime >= ? AND bpl.storageTime <= ?)
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ AND (
|
|
|
+ pl.partCode=?
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ AND ( pl.partName like concat("%",?,"%") or ? ='')
|
|
|
+ AND (
|
|
|
+ pl.providerId=?
|
|
|
+ OR ? = ''
|
|
|
+ )
|
|
|
+ORDER BY bpl.storageTime DESC, bpl.`id` DESC;
|
Yi