diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index 5954866..760f03f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -344,7 +344,7 @@ public class StructattrServiceImpl extends ServiceImpl strategy = one.getStrategy(); Map decisionerMap = SpringContextHolder.getBeansOfType(Decisioner.class); QueryWrapper query = new QueryWrapper() - .eq("is_used", true) + .eq("is_used", "1") .eq("lock_type",IOSEnum.LOCK_TYPE.code("未锁定")) .eq("sect_code", param.getSect_code()) .isNull("storagevehicle_code"); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java index 0a82962..ca687eb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java @@ -20,9 +20,11 @@ import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.basedata_manage.service.IBsrealStorattrService; +import org.nl.wms.basedata_manage.service.ISectattrService; import org.nl.wms.basedata_manage.service.IStructattrService; import org.nl.wms.basedata_manage.service.dao.BsrealStorattr; import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; +import org.nl.wms.basedata_manage.service.dao.Sectattr; import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleinfoMapper; import org.nl.wms.basedata_manage.service.dto.StrategyStructParam; @@ -66,6 +68,9 @@ public class RawAssistIStorServiceImpl extends ServiceImpl rows = (ArrayList) whereJson.get("tableData"); String currentUserId = SecurityUtils.getCurrentUserId(); @@ -217,6 +223,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl structattrs = iStructattrService.inBoundSectDiv( StrategyStructParam.builder() .ioType(param.getString("ioType")) - .sect_code(param.getString("sect_code")) - .stor_code(param.getString("stor_code")) + .sect_code(sect.getSect_code()) + .stor_code(stor.getStor_code()) .material_code(param.getString("material_code")) .qty(new BigDecimal(param.getString("qty"))) .pcsn(param.getString("pcsn")) diff --git a/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue b/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue index 7deac2b..ce91154 100644 --- a/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue +++ b/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue @@ -131,8 +131,7 @@ :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - - + diff --git a/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue b/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue index bfe996e..1c109a8 100644 --- a/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue +++ b/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue @@ -21,15 +21,6 @@ class="filter-item" @keyup.enter.native="crud.toQuery" /> - - diff --git a/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue index 545664e..5bb179e 100644 --- a/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue +++ b/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue @@ -64,7 +64,6 @@ - - { this.pointlist = res diff --git a/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue b/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue index 7634cde..9aac28f 100644 --- a/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue +++ b/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue @@ -109,8 +109,6 @@ - - @@ -136,8 +134,6 @@ > - - diff --git a/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index bcc56c6..731ae23 100644 --- a/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -127,7 +127,6 @@ - @@ -210,7 +209,6 @@ -