|
|
@@ -8,6 +8,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
|
|
use PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf;
|
|
|
use think\Config;
|
|
|
use think\Db;
|
|
|
+use think\Exception;
|
|
|
use think\Request;
|
|
|
use PhpOffice\PhpSpreadsheet\IOFactory;
|
|
|
use function fast\e;
|
|
|
@@ -517,6 +518,7 @@ class WorkOrder extends Api
|
|
|
'BOM_颜色' => $param['颜色备注'],
|
|
|
'BOM_物料编码' => $param['款号'].'-'.$param['颜色备注'].($key+1),
|
|
|
'BOM_物料名称' => $value['BOM_物料名称'],
|
|
|
+ 'U8UID' => $value['UNIQID'],
|
|
|
'BOM_投料单位' => '米',
|
|
|
'Sys_ID' => $param['Sys_id'],
|
|
|
'Sys_rq' => date('Y-m-d H:i:s',time()),
|
|
|
@@ -1773,7 +1775,8 @@ class WorkOrder extends Api
|
|
|
a.sys_id as 出库人员,
|
|
|
a.recipient as 领用人员,
|
|
|
a.receipt_number as 单号,
|
|
|
- c.BOM_desc as 备注
|
|
|
+ c.BOM_desc as 备注,
|
|
|
+ a.type as 退还类型
|
|
|
';
|
|
|
$list['入库记录'] = \db('设备_报工日志')
|
|
|
->alias('a')
|
|
|
@@ -2094,7 +2097,6 @@ class WorkOrder extends Api
|
|
|
b.BOM_定额门幅 as 定额门幅,c.实际门幅,c.状态,c.库存数量,c.入仓总量')
|
|
|
->whereNull('a.Mod_rq')
|
|
|
->select();
|
|
|
-
|
|
|
if (empty($list)){
|
|
|
$this->error('未找到该出库单');
|
|
|
}else{
|
|
|
@@ -2267,6 +2269,7 @@ class WorkOrder extends Api
|
|
|
->join('工单关联表 c','a.关联号 = c.关联编号')
|
|
|
->field($field)
|
|
|
->where('a.sys_rq','like',$param['date'].'%')
|
|
|
+ ->group('a.批次号')
|
|
|
->select();
|
|
|
if (empty($list)){
|
|
|
$this->error('未找到面料数据');
|
