|
@@ -1000,7 +1000,7 @@ def device_config_detail(params: ModelGetDeviceConfigDetail):
|
|
|
model = configModel.read(session, conditions={"id": action_id})
|
|
model = configModel.read(session, conditions={"id": action_id})
|
|
|
session.close()
|
|
session.close()
|
|
|
if model == None:
|
|
if model == None:
|
|
|
- return {"code": 1, "msg": "数据不存在", "data": None}
|
|
|
|
|
|
|
+ return {"code": 1, "msg": "相关配置不存在,请删除当前货号后重新拍摄", "data": None}
|
|
|
return {"code": 0, "msg": "", "data": model}
|
|
return {"code": 0, "msg": "", "data": model}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1117,7 +1117,7 @@ def get_photo_records(page: int = 1, size: int = 5):
|
|
|
# 查询这些货号的所有记录
|
|
# 查询这些货号的所有记录
|
|
|
query = (
|
|
query = (
|
|
|
select(PhotoRecord, DeviceConfig.action_name)
|
|
select(PhotoRecord, DeviceConfig.action_name)
|
|
|
- .join(DeviceConfig, PhotoRecord.action_id == DeviceConfig.id)
|
|
|
|
|
|
|
+ .outerjoin(DeviceConfig, PhotoRecord.action_id == DeviceConfig.id)
|
|
|
.where(PhotoRecord.goods_art_no.in_(current_goods_art_nos))
|
|
.where(PhotoRecord.goods_art_no.in_(current_goods_art_nos))
|
|
|
.where(PhotoRecord.delete_time == None)
|
|
.where(PhotoRecord.delete_time == None)
|
|
|
.order_by(PhotoRecord.goods_art_no, asc("id")) # 按货号分组并按ID倒序
|
|
.order_by(PhotoRecord.goods_art_no, asc("id")) # 按货号分组并按ID倒序
|
|
@@ -1692,6 +1692,10 @@ async def syncPhotoRecord(params:SyncPhotoRecord):
|
|
|
# 查询所有不重复的货号及对应的最大时间,进行分页
|
|
# 查询所有不重复的货号及对应的最大时间,进行分页
|
|
|
settings.USER_TOKEN = params.token
|
|
settings.USER_TOKEN = params.token
|
|
|
settings.USER_ENV = params.env
|
|
settings.USER_ENV = params.env
|
|
|
|
|
+ syncStatus = settings.checkRecordSyncStatus()
|
|
|
|
|
+ if syncStatus == True:
|
|
|
|
|
+ # 同步过就无需再同步
|
|
|
|
|
+ return {"code": 0, "message": "同步完成", "data": None}
|
|
|
session = SqlQuery()
|
|
session = SqlQuery()
|
|
|
base_statement = (
|
|
base_statement = (
|
|
|
select(PhotoRecord)
|
|
select(PhotoRecord)
|