|
|
@@ -79,13 +79,13 @@ sql
|
|
|
if ($batches){
|
|
|
foreach ($batches as $index=>$batch)$map[$batch->code] = $index;
|
|
|
}
|
|
|
- $update = [["id","wms_status","remark","updated_at"]];
|
|
|
+ $update = [["id","wms_status","wms_type","updated_at"]];
|
|
|
$insert = [];
|
|
|
foreach ($waves as $wave){
|
|
|
if (isset($map[$wave->waveno])){
|
|
|
$bat = $batches[$map[$wave->waveno]];
|
|
|
$wms_status = $this->wms_status($wave);
|
|
|
- if ($bat->wms_status != $wms_status || $bat->remark != $wave->descr){
|
|
|
+ if ($bat->wms_status != $wms_status || $bat->wms_type != $wave->descr){
|
|
|
$update[] = [
|
|
|
"id" => $bat->id,
|
|
|
"wms_status" => $this->wms_status($wave),
|
|
|
@@ -242,7 +242,7 @@ sql;
|
|
|
"code" => $wave->waveno,
|
|
|
"status" => '未处理',
|
|
|
"wms_status" => $this->wms_status($wave),
|
|
|
- "remark"=>$wave->descr,
|
|
|
+ "wms_type"=>$wave->descr,
|
|
|
"created_at"=>$wave->addtime,
|
|
|
"updated_at"=>$wave->edittime,
|
|
|
"owner_id"=>$owner->id,
|