fix:代码修复

This commit is contained in:
2023-05-25 22:13:55 +08:00
parent cc15c50bbf
commit 51513aaeea
8 changed files with 17 additions and 4 deletions

View File

@@ -1,6 +1,8 @@
package org.nl.wms.masterdata_manage.service.material.dao; package org.nl.wms.masterdata_manage.service.material.dao;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@@ -26,6 +28,7 @@ public class MdMeMaterialbase implements Serializable {
/** /**
* 物料标识 * 物料标识
*/ */
@TableId
private String material_id; private String material_id;
/** /**

View File

@@ -120,7 +120,7 @@ public class StIvtSectattrServiceImpl extends ServiceImpl<StIvtSectattrMapper, S
List sect_ja = new ArrayList<>(); List sect_ja = new ArrayList<>();
for (Map<String, String> map : sectList) { for (Map<String, String> map : sectList) {
Map sect_cas = new HashMap<>(); Map sect_cas = new HashMap<>();
sect_cas.put("value", map.get("sect_id")); sect_cas.put("value", String.valueOf(map.get("sect_id")));
sect_cas.put("label", map.get("sect_name")); sect_cas.put("label", map.get("sect_name"));
sect_ja.add(sect_cas); sect_ja.add(sect_cas);
} }

View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.productmanage.service.iostorInv.dao; package org.nl.wms.storage_manage.productmanage.service.iostorInv.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -27,6 +28,7 @@ public class StIvtIostorinvdisCp implements Serializable {
/** /**
* 出入单分配标识 * 出入单分配标识
*/ */
@TableId
private String iostorinvdis_id; private String iostorinvdis_id;
/** /**

View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.productmanage.service.iostorInv.dao; package org.nl.wms.storage_manage.productmanage.service.iostorInv.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -27,6 +28,7 @@ public class StIvtIostorinvdisdtlCp implements Serializable {
/** /**
* 出入单分配明细标识 * 出入单分配明细标识
*/ */
@TableId
private String iostorinvdisdtl_id; private String iostorinvdisdtl_id;
/** /**

View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.productmanage.service.iostorInv.dao; package org.nl.wms.storage_manage.productmanage.service.iostorInv.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@@ -25,6 +26,7 @@ public class StIvtIostorinvdtlCp implements Serializable {
/** /**
* 出入单明细标识 * 出入单明细标识
*/ */
@TableId
private String iostorinvdtl_id; private String iostorinvdtl_id;
/** /**

View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.productmanage.service.structIvt.dao; package org.nl.wms.storage_manage.productmanage.service.structIvt.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -25,6 +26,7 @@ public class StIvtStructivtCp implements Serializable {
/** /**
* 库存记录标识 * 库存记录标识
*/ */
@TableId
private String stockrecord_id; private String stockrecord_id;
/** /**

View File

@@ -52,7 +52,8 @@ public class DivRuleCpServiceImpl implements DivRuleCpService {
.isNull(StIvtStructattr::getStoragevehicle_code) .isNull(StIvtStructattr::getStoragevehicle_code)
.eq(StIvtStructattr::getIs_used, "1") //TODO 暂时写死 .eq(StIvtStructattr::getIs_used, "1") //TODO 暂时写死
.eq(StIvtStructattr::getLock_type, "1") //TODO 暂时写死 .eq(StIvtStructattr::getLock_type, "1") //TODO 暂时写死
); .orderByAsc(StIvtStructattr::getStruct_code)
,false);
break; break;
} }

View File

@@ -476,6 +476,7 @@ export default {
}, },
sectQueryChange(val) { sectQueryChange(val) {
debugger
this.sectProp = val this.sectProp = val
if (val.length === 1) { if (val.length === 1) {
this.stor_id = val[0] this.stor_id = val[0]
@@ -529,8 +530,8 @@ export default {
this.divBtn = true this.divBtn = true
debugger debugger
this.dis_row.stor_id = this.stor_id this.dis_row.stor_id = this.stor_id.toString()
this.dis_row.sect_id = this.sect_id this.dis_row.sect_id = this.sect_id.toString()
crudProductIn.divStruct(this.dis_row).then(res => { crudProductIn.divStruct(this.dis_row).then(res => {
crudProductIn.getIosInvDtl({ 'iostorinv_id': this.dis_row.iostorinv_id }).then(res => { crudProductIn.getIosInvDtl({ 'iostorinv_id': this.dis_row.iostorinv_id }).then(res => {
this.openParam = res this.openParam = res