root/yuenanFuJia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:富佳项目优化

Browse Source
This commit is contained in:
郑旭明\73939
2025-10-31 10:00:28 +08:00
parent a6a0bc5f06
commit 3869b2ceeb
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java
View File

@@ -26,6 +26,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
String is_connect_erp = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.IS_CONNECT_ERP).getValue(); String is_connect_erp = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.IS_CONNECT_ERP).getValue();
if(is_connect_erp.equals("1")){ if(is_connect_erp.equals("1")){
try { try {
log.info("instorinfoToErp接口地址------------" +url);
String resultMsg = HttpRequest.post(url) String resultMsg = HttpRequest.post(url)
.body(String.valueOf(whereJson)) .body(String.valueOf(whereJson))
.execute().body(); .execute().body();
@@ -35,7 +36,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
String status = result.getString("status"); String status = result.getString("status");
if (!EXTConstant.ERROR.equals(status)) { if (EXTConstant.ERROR.equals(status)) {
throw new BadRequestException(result.getString("message")); throw new BadRequestException(result.getString("message"));
} }

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml
View File

@@ -119,6 +119,7 @@
pm_form_data pm_form_data
left join md_me_materialbase on pm_form_data.material_code = md_me_materialbase.material_code left join md_me_materialbase on pm_form_data.material_code = md_me_materialbase.material_code
<where> <where>
(is_merge = 0 or is_merge is null)
<if test="query.search != null and query.search != ''"> <if test="query.search != null and query.search != ''">
and form_data LIKE '%${query.search}%' and form_data LIKE '%${query.search}%'
</if> </if>

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java
View File

@@ -137,7 +137,7 @@ public class RetrunServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
for (IOStorInvDis disDao : iosDisList) { for (IOStorInvDis disDao : iosDisList) {
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
// 载具编码 // 载具编码
param.put("pallet_sn", disDao.getStoragevehicle_code()); param.put("pallet_sn", mst.getVehicle_code());
param.put("instor_time", mst.getConfirm_time()); param.put("instor_time", mst.getConfirm_time());
param.put("barcode", mst.getBarcode()); param.put("barcode", mst.getBarcode());
wmsToErpService.instorinfoToErp(param); wmsToErpService.instorinfoToErp(param);

1
nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
View File

@@ -189,6 +189,7 @@
<el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_code',crud.data,'物料编码')" /> <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_name',crud.data,'物料名称')" /> <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip :min-width="flexWidth('material_spec',crud.data,'物料规格')" /> <el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="vehicle_code" label="托盘编码" show-overflow-tooltip width="220" />
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120" /> <el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120" />
<el-table-column prop="unit_name" label="单位" show-overflow-tooltip width="120" /> <el-table-column prop="unit_name" label="单位" show-overflow-tooltip width="120" />
<el-table-column prop="source_form_date" label="源单日期" show-overflow-tooltip width="120" /> <el-table-column prop="source_form_date" label="源单日期" show-overflow-tooltip width="120" />