|
|
@@ -223,10 +223,10 @@ class Boss extends Start_Controller
|
|
|
}
|
|
|
if ($y['type'] != 7 && $y['waybill'] != '' && $y['printtype'] == '1') {
|
|
|
$y['waybill'] = trim($y['waybill'], ' ');
|
|
|
- if (strlen($y['waybill']) == 12 && $y['express'] != 24 && $y['express'] != 31 && $y['express'] != 38 && $y['express'] != 41 && $y['express'] != 6 && $y['express'] != 43 && $y['express'] != 48 && $y['express'] != 50 && $y['express'] != 71 && $y['express'] != 73 && $y['express'] != 75 && $y['express'] != 78) {
|
|
|
+ if (strlen($y['waybill']) == 12 && $y['express'] != 24 && $y['express'] != 31 && $y['express'] != 38 && $y['express'] != 41 && $y['express'] != 6 && $y['express'] != 43 && $y['express'] != 48 && $y['express'] != 50 && $y['express'] != 71 && $y['express'] != 73 && $y['express'] != 75 && $y['express'] != 78 && $y['express'] != 79) {
|
|
|
echo json_encode(array('msg' => '出库物流和系统不匹配，请联系梦体解决' . $y['express'] . '-1', 'success' => false));
|
|
|
exit;
|
|
|
- } else if (strlen($y['waybill']) == 10 && $y['express'] != 1 && $y['express'] != 37 && $y['express'] != 49 && $y['express'] != 42 && $y['express'] != 78) {
|
|
|
+ } else if (strlen($y['waybill']) == 10 && $y['express'] != 1 && $y['express'] != 37 && $y['express'] != 49 && $y['express'] != 42 && $y['express'] != 78 && $y['express'] != 79) {
|
|
|
echo json_encode(array('msg' => '出库物流和系统不匹配，请联系梦体解决' . $y['express'] . '-2', 'success' => false));
|
|
|
exit;
|
|
|
} else if (strlen($y['waybill']) == 18 && $y['express'] != 3 && $y['express'] != 66 && $y['express'] != 67 && $y['express'] != 72 ) {
|
|
|
@@ -1626,7 +1626,7 @@ class Boss extends Start_Controller
|
|
|
if ($s) {
|
|
|
$shop = $this->shop->find_all("id = '$shop'");
|
|
|
} else {
|
|
|
- $shop = $this->shop->find_all("type = 269 and (" . rtrim($sid, 'or') . ')');
|
|
|
+ $shop = $this->shop->find_all("(type = 269 or type = 2768 ) and (" . rtrim($sid, 'or') . ')');
|
|
|
}
|
|
|
$d = array();
|
|
|
$k = $timetk - 24 * 3600; //少一天为增加选择开始天时间
|
