|
|
@@ -6,6 +6,7 @@ use bizGhs\clear\classes\ClearClass;
|
|
|
use bizGhs\clear\classes\OrderCgClearClass;
|
|
|
use bizGhs\clear\models\Clear;
|
|
|
use bizGhs\order\classes\OrderClass;
|
|
|
+use bizGhs\order\classes\PurchaseOrderClass;
|
|
|
use bizHd\purchase\classes\PurchaseClass;
|
|
|
use yii\console\Controller;
|
|
|
use Yii;
|
|
|
@@ -45,28 +46,49 @@ class ClearController extends Controller
|
|
|
$clearAmount = $clear['actPrice'] ?? 0;
|
|
|
$purchaseIds = $clear['purchaseIds'] ?? '';
|
|
|
$saleIds = $clear['saleIds'] ?? '';
|
|
|
+ $clearStyle = $clear['clearStyle'] ?? 1;
|
|
|
if (!isset($relate[$clearId])) {
|
|
|
- if (!empty($saleIds) && !empty($purchaseIds)) {
|
|
|
- $saleIdList = explode(',', $saleIds);
|
|
|
- $purchaseIdList = explode(',', $purchaseIds);
|
|
|
- $saleInfo = OrderClass::getAllByCondition(['id' => ['in', $saleIdList]], null, 'id,orderSn,purchaseId');
|
|
|
- $purchaseInfo = PurchaseClass::getAllByCondition(['id' => ['in', $purchaseIdList]], null, 'id,orderSn', 'id');
|
|
|
- if (!empty($saleInfo)) {
|
|
|
- foreach ($saleInfo as $sale) {
|
|
|
- $saleId = $sale['id'] ?? 0;
|
|
|
- $purchaseId = $sale['purchaseId'] ?? 0;
|
|
|
- $saleOrderSn = $sale['orderSn'] ?? '';
|
|
|
- $purchase = $purchaseInfo[$purchaseId] ?? [];
|
|
|
- if (empty($purchase)) {
|
|
|
- echo "purchase {$purchaseId} 没有找到 \n";
|
|
|
- exit();
|
|
|
- }
|
|
|
- $purchaseOrderSn = $purchase['orderSn'] ?? '';
|
|
|
- $addData = ['orderId' => $saleId, 'orderSn' => $saleOrderSn, 'cgId' => $purchaseId, 'cgSn' => $purchaseOrderSn,
|
|
|
+ if ($clearStyle == 3) {
|
|
|
+ if (!empty($purchaseIds)) {
|
|
|
+ $purchaseIdList = explode(',', $purchaseIds);
|
|
|
+ $purchaseInfo = PurchaseOrderClass::getAllByCondition(['id' => ['in', $purchaseIdList]], null, 'id,orderSn', 'id');
|
|
|
+ foreach ($purchaseInfo as $purchase) {
|
|
|
+ $purchaseId = $purchase['id']??0;
|
|
|
+ $purchaseOrderSn = $purchase['orderSn']??0;
|
|
|
+ $addData = ['orderId' => 0, 'orderSn' => '', 'cgId' => $purchaseId, 'cgSn' => $purchaseOrderSn,
|
|
|
'clearId' => $clearId, 'clearSn' => $clearSn, 'amount' => $clearAmount, 'status' => $status];
|
|
|
- OrderCgClearClass::add($addData);
|
|
|
+ print_r($addData);
|
|
|
+ //OrderCgClearClass::add($addData);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ echo "供货商采购 clearId {$clearId} 有缺数据 \n";
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ continue;
|
|
|
+ if (!empty($saleIds) && !empty($purchaseIds)) {
|
|
|
+ $saleIdList = explode(',', $saleIds);
|
|
|
+ $purchaseIdList = explode(',', $purchaseIds);
|
|
|
+ $saleInfo = OrderClass::getAllByCondition(['id' => ['in', $saleIdList]], null, 'id,orderSn,purchaseId');
|
|
|
+ $purchaseInfo = PurchaseClass::getAllByCondition(['id' => ['in', $purchaseIdList]], null, 'id,orderSn', 'id');
|
|
|
+ if (!empty($saleInfo)) {
|
|
|
+ foreach ($saleInfo as $sale) {
|
|
|
+ $saleId = $sale['id'] ?? 0;
|
|
|
+ $purchaseId = $sale['purchaseId'] ?? 0;
|
|
|
+ $saleOrderSn = $sale['orderSn'] ?? '';
|
|
|
+ $purchase = $purchaseInfo[$purchaseId] ?? [];
|
|
|
+ if (empty($purchase)) {
|
|
|
+ echo "purchase {$purchaseId} 没有找到 \n";
|
|
|
+ exit();
|
|
|
+ }
|
|
|
+ $purchaseOrderSn = $purchase['orderSn'] ?? '';
|
|
|
+ $addData = ['orderId' => $saleId, 'orderSn' => $saleOrderSn, 'cgId' => $purchaseId, 'cgSn' => $purchaseOrderSn,
|
|
|
+ 'clearId' => $clearId, 'clearSn' => $clearSn, 'amount' => $clearAmount, 'status' => $status];
|
|
|
+ OrderCgClearClass::add($addData);
|
|
|
+ }
|
|
|
+ echo "clearId {$clearId} OK \n";
|
|
|
}
|
|
|
- echo "clearId {$clearId} OK \n";
|
|
|
+ } else {
|
|
|
+ echo "花店采购 clearId {$clearId} 有缺数据 \n";
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
@@ -74,7 +96,7 @@ class ClearController extends Controller
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $transaction->commit();
|
|
|
+ //$transaction->commit();
|
|
|
|
|
|
} catch (\Exception $e) {
|
|
|
$transaction->rollBack();
|