|
|
@@ -161,7 +161,7 @@ class StoreController extends Controller
|
|
|
$asn = $db->selectOne($query,[$asnno]);
|
|
|
if (!$asn) return ['success'=>false, 'data'=>"单据号不存在"];
|
|
|
if ((int)$asn->asnstatus >= 40)return ['success'=>false, 'data'=>'单据号已完成收货'];
|
|
|
- $query = DB::raw("SELECT b.ALTERNATE_SKU1,h.WAREHOUSEID,h.asnno,d.ASNLINENO,d.SKUDESCRC,h.CUSTOMERID,d.SKU,d.PACKID,d.EXPECTEDQTY_EACH,d.LOTATT01,d.LOTATT02,d.lotatt04,".
|
|
|
+ $query = DB::raw("SELECT b.ALTERNATE_SKU1,h.WAREHOUSEID,h.asnno,d.ASNLINENO,d.SKUDESCRC,h.CUSTOMERID,d.SKU,d.PACKID,d.RECEIVEDQTY_EACH,d.EXPECTEDQTY_EACH,d.LOTATT01,d.LOTATT02,d.lotatt04,".
|
|
|
"d.lotatt05,d.lotatt08,d.USERDEFINE1,d.USERDEFINE2,d.USERDEFINE3,d.USERDEFINE4,d.USERDEFINE5,d.RECEIVINGLOCATION FROM DOC_ASN_DETAILS d ".
|
|
|
" LEFT JOIN BAS_SKU b ON d.CUSTOMERID = b.CUSTOMERID AND d.SKU = b.SKU INNER JOIN DOC_ASN_HEADER h ON d.ASNNO = h.ASNNO WHERE h.ASNNO = ?");
|
|
|
$details = $db->select($query,[$asnno]);
|
|
|
@@ -236,7 +236,7 @@ class StoreController extends Controller
|
|
|
$In_PONo_C = '';
|
|
|
$In_CustomerID = $detail->customerid ?? '';
|
|
|
$In_SKU = $detail->sku ?? '';
|
|
|
- $In_ReceivedQty = $detail->expectedqty_each ?? '';
|
|
|
+ $In_ReceivedQty = (string)((int)$detail->expectedqty_each - (int)$detail->receivedqty_each) ?? '';
|
|
|
$In_RejectedQty = '';
|
|
|
$In_UOM = 'EA';
|
|
|
$In_PackID = $detail->packid ?? '';
|