|
|
@@ -32,6 +32,7 @@ use common\components\imgUtil;
|
|
|
use common\components\noticeUtil;
|
|
|
use common\components\orderSn;
|
|
|
use common\components\printUtil;
|
|
|
+use common\components\stringUtil;
|
|
|
use common\components\util;
|
|
|
use Yii;
|
|
|
|
|
|
@@ -345,10 +346,6 @@ class PurchaseOrderClass extends BaseClass
|
|
|
if (in_array($mainId, [23390])) {
|
|
|
return true;
|
|
|
}
|
|
|
- } else {
|
|
|
- if (in_array($mainId, [644])) {
|
|
|
- return true;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
$content = "<CB>" . $currentName . "</CB>";
|
|
|
@@ -422,6 +419,7 @@ class PurchaseOrderClass extends BaseClass
|
|
|
$content .= '录入人员:' . $orderInfo['shopAdminName'] . '<BR>';
|
|
|
}
|
|
|
$content .= "<BR>";
|
|
|
+ $content .= "<C>扫码查货位</C>";
|
|
|
$content .= "<BR>";
|
|
|
$host = Yii::$app->params['hdHost'];
|
|
|
$orderSn = $orderInfo->orderSn ?? '';
|
|
|
@@ -896,7 +894,7 @@ class PurchaseOrderClass extends BaseClass
|
|
|
}
|
|
|
$avgKgWeight = round($avgKgWeight, 2);
|
|
|
$data['avgKgWeight'] = $avgKgWeight;
|
|
|
-
|
|
|
+ $data['salt'] = stringUtil::charsShuffleLowerCase(8);
|
|
|
$data['cgStyle'] = dict::getDict('cgStyle', 'ghs');
|
|
|
$order = self::add($data, true);
|
|
|
|