' +
'
📝 下单备注
' +
'' +
@@ -19790,6 +19846,9 @@ window.showSkuInfoModal = function(el, title) {
if (d.product_name) fields.push(['货品名称', d.product_name]);
if (d.brand) fields.push(['品牌', d.brand]);
if (d.product_type) fields.push(['产品类型', d.product_type]);
+ if (title && title.indexOf('海外') !== -1 && window._canViewField('orders_overseas', '新旧品')) {
+ fields.push(['新旧品', el.dataset.newOld || '-']);
+ }
if (d.product_grade) fields.push(['产品分级', d.product_grade]);
if (d.cost_price !== null && d.cost_price !== undefined && d.cost_price !== '') fields.push(['成本价', formatPrice4(d.cost_price, true)]);
if (d.supplier_name) fields.push(['供应商', d.supplier_name]);
@@ -19927,6 +19986,7 @@ function showOrderDetail(encodedStr, title) {
col2 = [
{label:'预计到货日期', field:'预计到货日期', editable:true, type:'date'},
{label:'货品名称', field:'货品名称', editable:false},
+ {label:'新旧品', field:'新旧品', editable:false},
{label:'跟单下单日期', field:'日期', editable:true, type:'date'},
{label:'计划下单日期', field:'计划下单时间', editable:true, type:'date'},
{label:'实际下单数量', field:'数量', editable:true},
@@ -22181,8 +22241,9 @@ function loadOverseasOrdersPage(container) {
if (fieldAttr === '产品编码') thStyle = 'min-width:120px;position:sticky;left:90px;z-index:3;background:var(--bg,#f5f5f5)';
else if (fieldAttr === '货品名称') thStyle = 'min-width:200px;position:sticky;left:210px;z-index:3;background:var(--bg,#f5f5f5)';
else if (fieldAttr === '货品类型') thStyle = 'min-width:100px;position:sticky;left:410px;z-index:3;background:var(--bg,#f5f5f5)';
- else if (fieldAttr === '日期') thStyle = 'width:85px;min-width:85px;position:sticky;left:510px;z-index:3;background:var(--bg,#f5f5f5)';
- else if (fieldAttr === '计划下单时间' || fieldAttr === '新旧品') thStyle = 'width:1%;white-space:nowrap';
+ else if (fieldAttr === '新旧品') thStyle = 'width:80px;min-width:80px;position:sticky;left:510px;z-index:3;background:var(--bg,#f5f5f5)';
+ else if (fieldAttr === '日期') thStyle = 'width:85px;min-width:85px;position:sticky;left:590px;z-index:3;background:var(--bg,#f5f5f5)';
+ else if (fieldAttr === '计划下单时间') thStyle = 'width:1%;white-space:nowrap';
else if (fieldAttr === '单价') thStyle = 'min-width:70px';
else if (fieldAttr === '是否审核价格') thStyle = 'min-width:80px';
else if (fieldAttr === '数量') thStyle = 'min-width:60px';
@@ -22355,13 +22416,13 @@ function overseasLoadOrders(page) { overseasOrderPage = page;
order.forEach(function(field) {
var cellHtml = '';
if (field === '产品编码') {
- cellHtml = '
' + escHtml(r['产品编码'] || '') + ' | ';
+ cellHtml = '
' + escHtml(r['产品编码'] || '') + ' | ';
} else if (field === '货品名称') {
cellHtml = '
' + escHtml(r['货品名称'] || '') + ' | ';
} else if (field === '货品类型') {
cellHtml = '
' + escHtml(r['货品类型'] || '') + ' | ';
} else if (field === '日期') {
- cellHtml = '
' + escHtml(window._padDateStr(r['日期'] || '')) + ' | ';
+ cellHtml = '
' + escHtml(window._padDateStr(r['日期'] || '')) + ' | ';
} else if (field === '计划下单时间') {
var planTime = window._formatPlanOrderTime(r['计划下单时间'] || '');
cellHtml = '
' + escHtml(planTime) + ' | ';
@@ -22381,7 +22442,7 @@ function overseasLoadOrders(page) { overseasOrderPage = page;
} else if (field === '仓库') {
cellHtml = '
' + escHtml(r['仓库'] || '') + ' | ';
} else if (field === '新旧品') {
- cellHtml = '
' + escHtml(r['新旧品'] || '') + ' | ';
+ cellHtml = '
' + escHtml(r['新旧品'] || '') + ' | ';
} else if (field === '是否已做采购单') {
cellHtml = '
' + escHtml(r['是否已做采购单'] || '') + ' | ';
} else if (field === '是否做入库') {
@@ -25006,6 +25067,7 @@ const OVERSEAS_COLUMNS = [
{field:'产品编码',label:'货品编号',defShow:true},
{field:'货品名称',label:'货品名称',defShow:true},
{field:'货品类型',label:'货品类型',defShow:true},
+ {field:'新旧品',label:'新旧品',defShow:true},
{field:'日期',label:'跟单下单日期',defShow:true},
{field:'计划下单时间',label:'计划下单日期',defShow:true},
{field:'单价',label:'单价',defShow:true,type:'number'},
@@ -25014,7 +25076,6 @@ const OVERSEAS_COLUMNS = [
{field:'金额',label:'金额',defShow:true,type:'number'},
{field:'供应商',label:'供应商名称',defShow:true},
{field:'仓库',label:'仓库',defShow:true},
- {field:'新旧品',label:'新旧品',defShow:true},
{field:'是否已做采购单',label:'已做采购单',defShow:true},
{field:'是否做入库',label:'金蝶是否入库',defShow:true},
{field:'采购员',label:'跟单小组',defShow:true},
@@ -25434,6 +25495,11 @@ window.loadOrderScheme = function(type, schemeId) {
pendingVisible[c.field] = false;
}
});
+ if (type === 'overseas') {
+ newOrder = newOrder.filter(function(field) { return field !== '新旧品'; });
+ var productTypeIndex = newOrder.indexOf('货品类型');
+ newOrder.splice(productTypeIndex < 0 ? newOrder.length : productTypeIndex + 1, 0, '新旧品');
+ }
window[dragVar] = newOrder.slice();
Object.keys(pendingVisible).forEach(function(field) {
window[pendingVar][field] = pendingVisible[field];
@@ -27075,7 +27141,7 @@ window.exportBom = function() {
// ─── 统一产品详情弹窗（固定字段，参考弹窗展示内容1方案）───
var POPUP_VISIBLE_FIELDS = [
- 'product_type', '产品种类', 'product_code', 'product_name', '产品分级',
+ 'product_type', '产品种类', 'product_code', 'product_name', '新旧品', '产品分级',
'昨日销量', '销售趋势',
'库存', '加工厂库存', '生产在途', '采购在途',
'日销量预测',
@@ -27090,6 +27156,7 @@ var POPUP_VISIBLE_FIELDS = [
/** 字段显示名称映射 */
var POPUP_FIELD_LABELS = {
+ '新旧品': '新旧品',
'product_type': '产品类型',
'产品种类': '产品种类',
'product_code': '货品编号',
@@ -27297,6 +27364,7 @@ function planBatchOrder() {
}
showCenteredConfirm('确认', '确认将选中的 ' + checkedCodes.length + ' 个商品加入待下单列表？').then(function(ok) {
if (!ok) return;
+ if (planNewOldStillSaving(checkedCodes)) return;
// 清除待下单页面缓存
if (window._pageCache) delete window._pageCache['purchase'];
fetch('/api/purchase/batch_add_pending', {
@@ -27508,6 +27576,7 @@ window.planOrder = function(data) {
alert('数据异常，无法下单');
return;
}
+ if (planNewOldStillSaving([data.product_code])) return;
// 从页面读取当前最新的正式下单数量（用户可能已通过 ✏️ 编辑修改过）
var fqvSpan = document.getElementById('fqv-' + data.product_code);
if (fqvSpan) {
@@ -27680,6 +27749,7 @@ function renderPlanConfirmDialog(modal, data, bomMaterials) {
document.getElementById('planOrderCancelBtn').onclick = function() { modal.remove(); };
document.getElementById('planOrderConfirmBtn').onclick = function() {
+ if (planNewOldStillSaving([data.product_code])) return;
modal.remove();
if (window._pageCache) delete window._pageCache['purchase'];
var orderData = JSON.parse(JSON.stringify(data));
@@ -27765,6 +27835,7 @@ window.showProductDetail = function(productCode) {
// \u5206\u7ec4\u5b9a\u4e49\uff1a\u57fa\u7840\u4fe1\u606f\uff082\u5217\uff09/ \u9500\u91cf\u4fe1\u606f\uff084\u5217\uff09
var basicFields = ['product_type', '\u4ea7\u54c1\u79cd\u7c7b', 'product_code', 'product_name',
+ '新旧品',
'\u4f9b\u5e94\u5546\u540d\u79f0', '\u751f\u4ea7\u8d27\u671f', '\u7269\u6d41\u65f6\u95f4', '\u521b\u5efa\u65f6\u95f4', '\u6279\u6ce8'];
var salesFields = ['\u4ea7\u54c1\u5206\u7ea7', '\u6628\u65e5\u9500\u91cf', '\u9500\u552e\u8d8b\u52bf', '\u5e93\u5b58', '\u52a0\u5de5\u5382\u5e93\u5b58', '\u751f\u4ea7\u5728\u9014', '\u91c7\u8d2d\u5728\u9014',
'\u65e5\u9500\u91cf\u9884\u6d4b', '3\u5929\u5e73\u5747\u9500\u91cf', '7\u5929\u5e73\u5747\u9500\u91cf', '14\u5929\u5e73\u5747\u9500\u91cf',
diff --git a/tests/test_planning_new_old.py b/tests/test_planning_new_old.py
new file mode 100644
index 0000000..1d61bf4
--- /dev/null
+++ b/tests/test_planning_new_old.py
@@ -0,0 +1,121 @@
+"""Exercise the manual flag across save, pending and overseas confirmation."""
+import unittest
+from unittest import mock
+from flask import Flask
+
+import routes.planning as planning
+import routes.purchase as purchase
+import services.field_perms as field_perms
+import services.planning_order_flag as flags
+
+
+class PlanningNewOldTest(unittest.TestCase):
+ def setUp(self):
+ self.app = Flask(__name__)
+ self.app.secret_key = 'unit-test'
+
+ def test_save_rejects_invalid_choice_and_missing_permission(self):
+ for value, allowed, expected in [('新品', True, 400), ('是', False, 403)]:
+ with self.subTest(value=value, allowed=allowed), self.app.test_request_context(
+ json={'product_code': 'P1', 'value': value}
+ ), mock.patch.object(planning, 'operation_required', return_value=allowed), \
+ mock.patch.object(field_perms, 'field_perms_for_page', return_value={'新旧品': {'edit': allowed}}), \
+ mock.patch.object(planning, 'query') as sql:
+ response, status = planning.planning_new_old_save.__wrapped__()
+ self.assertEqual(status, expected)
+ sql.assert_not_called()
+
+ def test_save_both_choices(self):
+ for value in ('是', '否'):
+ with self.subTest(value=value), self.app.test_request_context(
+ json={'product_code': 'P1', 'value': value}
+ ), mock.patch.object(planning, 'operation_required', return_value=True), \
+ mock.patch.object(field_perms, 'field_perms_for_page', return_value={'新旧品': {'edit': True}}), \
+ mock.patch.object(planning, 'query', return_value=[{'planning_new_old': '否'}]) as sql, \
+ mock.patch.object(planning, 'add_operation_log'):
+ response = planning.planning_new_old_save.__wrapped__()
+ self.assertEqual(response.get_json()['code'], 0)
+ self.assertEqual(sql.call_args.args[1], (value, 'P1'))
+
+ def test_saved_snapshot_survives_later_planning_changes(self):
+ for value in ('是', '否'):
+ with mock.patch.object(flags, 'query') as sql:
+ self.assertEqual(flags.snapshot_new_old('P1', value), value)
+ sql.assert_not_called()
+ with mock.patch.object(flags, 'query', return_value=[{'planning_new_old': '是'}]):
+ self.assertEqual(flags.snapshot_new_old('P1'), '是')
+
+ def test_single_add_and_quantity_edit_capture_and_preserve_choice(self):
+ for existing, captured in [(None, '是'), ({'id': 5, 'bom_items': None, 'new_old_product': '否'}, '否')]:
+ writes = []
+ def sql(query, params=None):
+ if query.lstrip().startswith('SELECT id, bom_items'):
+ return [existing] if existing else []
+ if query.lstrip().startswith('SELECT'):
+ return []
+ self.assertEqual(query.count('%s'), len(params))
+ writes.append((query, params))
+ return 5
+ with self.subTest(existing=existing), self.app.test_request_context(json={
+ 'product_code': 'P1', 'product_name': '商品', 'product_type': '成品', 'formal_order_qty': 10
+ }), mock.patch.object(purchase, '_require_purchase_operation', return_value=None), \
+ mock.patch.object(purchase, 'query', side_effect=sql), \
+ mock.patch.object(flags, 'query', return_value=[{'planning_new_old': '是'}]):
+ response = purchase.purchase_add_pending.__wrapped__()
+ self.assertEqual(response.get_json()['code'], 0)
+ params = writes[0][1]
+ self.assertEqual(params[-2] if existing else params[-1], captured)
+
+ def test_batch_add_captures_each_product_choice(self):
+ writes = []
+ def sql(query, params=None):
+ if 'SELECT p.product_code' in query:
+ return [{'product_code': 'P1', 'planning_new_old': '是'},
+ {'product_code': 'P2', 'planning_new_old': '否'}]
+ if query.lstrip().startswith('SELECT'):
+ return []
+ self.assertEqual(query.count('%s'), len(params))
+ writes.append(params)
+ return 1
+ with self.app.test_request_context(json={'product_codes': ['P1', 'P2']}), \
+ mock.patch.object(purchase, '_require_purchase_operation', return_value=None), \
+ mock.patch.object(purchase, 'query', side_effect=sql), \
+ mock.patch.object(purchase, 'add_operation_log'):
+ response = purchase.purchase_batch_add_pending.__wrapped__()
+ self.assertEqual(response.get_json()['data']['added'], 2)
+ self.assertEqual([params[-1] for params in writes], ['是', '否'])
+
+ def test_confirm_overseas_uses_snapshot_instead_of_current_product_value(self):
+ for value in ('是', '否'):
+ writes = []
+ def sql(query, params=None):
+ if 'SELECT product_code FROM pending_orders' in query:
+ return [{'product_code': 'P1'}]
+ if 'SELECT brand, product_name FROM products' in query:
+ return [{'brand': 'TEST', 'product_name': '商品'}]
+ if 'SELECT category FROM brand_information' in query:
+ return [{'category': '海外'}]
+ if 'SELECT * FROM pending_orders' in query:
+ return [{'id': 5, 'product_code': 'P1', 'product_name': '商品',
+ 'formal_order_qty': 10, 'new_old_product': value}]
+ if query.lstrip().startswith('SELECT'):
+ return []
+ self.assertEqual(query.count('%s'), len(params))
+ writes.append((query, params))
+ return 1
+ with self.subTest(value=value), self.app.test_request_context(json={'product_codes': ['P1']}), \
+ mock.patch.object(purchase, '_require_purchase_operation', return_value=None), \
+ mock.patch.object(purchase, 'query', side_effect=sql), \
+ mock.patch.object(purchase, 'execute', return_value=1), \
+ mock.patch.object(purchase, '_resolve_follower_group', return_value=''), \
+ mock.patch.object(purchase, '_is_overseas_notify_product', return_value=False), \
+ mock.patch.object(flags, 'query') as current:
+ response = purchase.purchase_confirm_order.__wrapped__()
+ self.assertEqual(response.get_json()['code'], 0)
+ order = next(params for query, params in writes if 'INSERT INTO overseas_orders' in query)
+ self.assertEqual(order[-1], value)
+ current.assert_not_called()
+
+
+if __name__ == '__main__':
+ unittest.main()