|
|
@@ -271,6 +271,9 @@ class Facility extends Api
|
|
|
$class = \db('设备_班组资料')->where('UniqId',$data['班组ID'])->field("rtrim(sczl_bh1) as bh1,rtrim(sczl_bh2) as bh2,rtrim(sczl_bh3) as bh3,rtrim(sczl_bh4) as bh4,
|
|
|
rtrim(sczl_bh5) as bh5,rtrim(sczl_bh6) as bh6,rtrim(sczl_bh7) as bh7,rtrim(sczl_bh8) as bh8,rtrim(sczl_bh9) as bh9,
|
|
|
rtrim(sczl_bh10) as bh10")->find();
|
|
|
+ if (empty($class)){
|
|
|
+ $this->success('未找到班组信息');
|
|
|
+ }
|
|
|
$row = [];
|
|
|
for ($i=1;$i<11;$i++) {
|
|
|
if ($class['bh' . $i] != '' && $class['bh' . $i] != '000000') {
|
|
|
@@ -1884,6 +1887,11 @@ class Facility extends Api
|
|
|
$this->success('未找到产量详情信息');
|
|
|
}
|
|
|
$productName = \db('工单_基本资料')->whereIn('Gd_gdbh',$list['工单编号'])->field('rtrim(成品名称) as 成品名称,rtrim(Gd_cpmc) as cpmc')->find();
|
|
|
+ $printList = \db('工单_印件资料')
|
|
|
+ ->where('Yj_Gdbh',$list['工单编号'])
|
|
|
+ ->where('yj_Yjno',$list['yjno'])
|
|
|
+ ->value('rtrim(yj_yjmc)');
|
|
|
+ $list['印件名称'] = $printList;
|
|
|
if (!empty($productName['成品名称'])){
|
|
|
$list['cpmc'] = $productName['成品名称'];
|
|
|
}elseif (empty($productName['成品名称']) && !empty($productName['cpmc'])){
|
