diff --git a/wms/contract/insertData.php b/wms/contract/insertData.php index aa7e4bf6..38ee1051 100644 --- a/wms/contract/insertData.php +++ b/wms/contract/insertData.php @@ -140,7 +140,7 @@ foreach ($sheet->getRowIterator() as $key => $row) { $option_price_id = $last_id; $option_price = $cost; - $quotation_no = 'Q2401001'; + $quotation_no = 'Q2401002'; foreach ($open_kind_arr as $kind) { $min_weight = 1; $max_weight = 1600; diff --git a/wms/contract/option/option1.xlsx b/wms/contract/option/option1.xlsx index 4a197ec5..122bf90a 100644 Binary files a/wms/contract/option/option1.xlsx and b/wms/contract/option/option1.xlsx differ diff --git a/wms/contract/option/option10.xlsx b/wms/contract/option/option10.xlsx index 4087ccf5..034aaa77 100644 Binary files a/wms/contract/option/option10.xlsx and b/wms/contract/option/option10.xlsx differ diff --git a/wms/contract/option/option11.xlsx b/wms/contract/option/option11.xlsx index 9dc16b7e..5224e609 100644 Binary files a/wms/contract/option/option11.xlsx and b/wms/contract/option/option11.xlsx differ diff --git a/wms/contract/option/option12.xlsx b/wms/contract/option/option12.xlsx index 1f57b701..e2a1ac6f 100644 Binary files a/wms/contract/option/option12.xlsx and b/wms/contract/option/option12.xlsx differ diff --git a/wms/contract/option/option.xlsx b/wms/contract/option/option1220/option.xlsx similarity index 100% rename from wms/contract/option/option.xlsx rename to wms/contract/option/option1220/option.xlsx diff --git a/wms/contract/option/option1220/option1.xlsx b/wms/contract/option/option1220/option1.xlsx new file mode 100644 index 00000000..4a197ec5 Binary files /dev/null and b/wms/contract/option/option1220/option1.xlsx differ diff --git a/wms/contract/option/option1220/option10.xlsx b/wms/contract/option/option1220/option10.xlsx new file mode 100644 index 00000000..4087ccf5 Binary files /dev/null and b/wms/contract/option/option1220/option10.xlsx differ diff --git a/wms/contract/option/option1220/option11.xlsx b/wms/contract/option/option1220/option11.xlsx new file mode 100644 index 00000000..9dc16b7e Binary files /dev/null and b/wms/contract/option/option1220/option11.xlsx differ diff --git a/wms/contract/option/option1220/option12.xlsx b/wms/contract/option/option1220/option12.xlsx new file mode 100644 index 00000000..1f57b701 Binary files /dev/null and b/wms/contract/option/option1220/option12.xlsx differ diff --git a/wms/contract/option/option1220/option13.xlsx b/wms/contract/option/option1220/option13.xlsx new file mode 100644 index 00000000..df84bbc7 Binary files /dev/null and b/wms/contract/option/option1220/option13.xlsx differ diff --git a/wms/contract/option/option1220/option14.xlsx b/wms/contract/option/option1220/option14.xlsx new file mode 100644 index 00000000..a36ca847 Binary files /dev/null and b/wms/contract/option/option1220/option14.xlsx differ diff --git a/wms/contract/option/option1220/option15.xlsx b/wms/contract/option/option1220/option15.xlsx new file mode 100644 index 00000000..7ef897bc Binary files /dev/null and b/wms/contract/option/option1220/option15.xlsx differ diff --git a/wms/contract/option/option16.xlsx b/wms/contract/option/option1220/option16.xlsx similarity index 100% rename from wms/contract/option/option16.xlsx rename to wms/contract/option/option1220/option16.xlsx diff --git a/wms/contract/option/option1220/option2.xlsx b/wms/contract/option/option1220/option2.xlsx new file mode 100644 index 00000000..17daba20 Binary files /dev/null and b/wms/contract/option/option1220/option2.xlsx differ diff --git a/wms/contract/option/option20.xlsx b/wms/contract/option/option1220/option20.xlsx similarity index 100% rename from wms/contract/option/option20.xlsx rename to wms/contract/option/option1220/option20.xlsx diff --git a/wms/contract/option/option1220/option3.xlsx b/wms/contract/option/option1220/option3.xlsx new file mode 100644 index 00000000..5c39ee18 Binary files /dev/null and b/wms/contract/option/option1220/option3.xlsx differ diff --git a/wms/contract/option/option1220/option4.xlsx b/wms/contract/option/option1220/option4.xlsx new file mode 100644 index 00000000..c44f5df5 Binary files /dev/null and b/wms/contract/option/option1220/option4.xlsx differ diff --git a/wms/contract/option/option1220/option5.xlsx b/wms/contract/option/option1220/option5.xlsx new file mode 100644 index 00000000..170ca69c Binary files /dev/null and b/wms/contract/option/option1220/option5.xlsx differ diff --git a/wms/contract/option/option1220/option6.xlsx b/wms/contract/option/option1220/option6.xlsx new file mode 100644 index 00000000..68f18ef9 Binary files /dev/null and b/wms/contract/option/option1220/option6.xlsx differ diff --git a/wms/contract/option/option1220/option7.xlsx b/wms/contract/option/option1220/option7.xlsx new file mode 100644 index 00000000..ee4d39eb Binary files /dev/null and b/wms/contract/option/option1220/option7.xlsx differ diff --git a/wms/contract/option/option1220/option8.xlsx b/wms/contract/option/option1220/option8.xlsx new file mode 100644 index 00000000..5f431522 Binary files /dev/null and b/wms/contract/option/option1220/option8.xlsx differ diff --git a/wms/contract/option/option1220/option9.xlsx b/wms/contract/option/option1220/option9.xlsx new file mode 100644 index 00000000..90616cc0 Binary files /dev/null and b/wms/contract/option/option1220/option9.xlsx differ diff --git a/wms/contract/option/option13.xlsx b/wms/contract/option/option13.xlsx index df84bbc7..74efcbaa 100644 Binary files a/wms/contract/option/option13.xlsx and b/wms/contract/option/option13.xlsx differ diff --git a/wms/contract/option/option14.xlsx b/wms/contract/option/option14.xlsx index a36ca847..07d5b6ce 100644 Binary files a/wms/contract/option/option14.xlsx and b/wms/contract/option/option14.xlsx differ diff --git a/wms/contract/option/option15.xlsx b/wms/contract/option/option15.xlsx index 7ef897bc..3620e7ca 100644 Binary files a/wms/contract/option/option15.xlsx and b/wms/contract/option/option15.xlsx differ diff --git a/wms/contract/option/option2.xlsx b/wms/contract/option/option2.xlsx index 17daba20..4cf1f87c 100644 Binary files a/wms/contract/option/option2.xlsx and b/wms/contract/option/option2.xlsx differ diff --git a/wms/contract/option/option3.xlsx b/wms/contract/option/option3.xlsx index 5c39ee18..4c3416ef 100644 Binary files a/wms/contract/option/option3.xlsx and b/wms/contract/option/option3.xlsx differ diff --git a/wms/contract/option/option4.xlsx b/wms/contract/option/option4.xlsx index c44f5df5..7046969e 100644 Binary files a/wms/contract/option/option4.xlsx and b/wms/contract/option/option4.xlsx differ diff --git a/wms/contract/option/option5.xlsx b/wms/contract/option/option5.xlsx index 170ca69c..9e70e1e8 100644 Binary files a/wms/contract/option/option5.xlsx and b/wms/contract/option/option5.xlsx differ diff --git a/wms/contract/option/option6.xlsx b/wms/contract/option/option6.xlsx index 68f18ef9..d647884b 100644 Binary files a/wms/contract/option/option6.xlsx and b/wms/contract/option/option6.xlsx differ diff --git a/wms/contract/option/option7.xlsx b/wms/contract/option/option7.xlsx index ee4d39eb..3af4c28d 100644 Binary files a/wms/contract/option/option7.xlsx and b/wms/contract/option/option7.xlsx differ diff --git a/wms/contract/option/option8.xlsx b/wms/contract/option/option8.xlsx index 5f431522..7f1c37eb 100644 Binary files a/wms/contract/option/option8.xlsx and b/wms/contract/option/option8.xlsx differ diff --git a/wms/contract/option/option9.xlsx b/wms/contract/option/option9.xlsx index 90616cc0..1d43cf6f 100644 Binary files a/wms/contract/option/option9.xlsx and b/wms/contract/option/option9.xlsx differ diff --git a/wms/frame/pending.php b/wms/frame/pending.php index 89a929a4..dc552e06 100644 --- a/wms/frame/pending.php +++ b/wms/frame/pending.php @@ -89,6 +89,7 @@ function here() { url: URL, success: function (msg) { var obj = JSON.parse(msg); + console.log(obj); var myhtml = ''; if (obj.st == 'ok') { myhtml += '