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

rev:修改dtlSplit判断

Browse Source
This commit is contained in:
zhangzq
2024-11-20 13:24:00 +08:00
parent 82c1b57f29
commit 6d4e264b3b
10 changed files with 100 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
View File

@@ -24,7 +24,9 @@ public class DictConstantPool {
,"biz_status","业务单据状态"
,"biz_form_type","业务单据类型"
,"material_id","物料id"
,"qty","数量"
,"qty","申请数量"
,"plan_qty","计划数量"
,"assign_qty","已领数量"
,"unit_id","单位"
,"pcsn","批次"
,"vehicle_code","载具");

10
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
View File

@@ -98,10 +98,18 @@ public class BmFormStruc implements Serializable {
private String vehicle_id;
/**
* 数量
* 申请数量（必须有）
*/
private String qty;
/**
* 计划数量
*/
private String plan_qty;
/**
* 已领取数量
*/
private String assign_qty;
/**
* 单位id
*/

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java
View File

@@ -7,6 +7,7 @@ import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.enums.StatusEnum;
import org.nl.common.utils.MapOf;
import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService;
import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -49,13 +51,13 @@ public class PdaOutController {
@GetMapping("order")
@Log("出库单据列表")
@SaIgnore
public ResponseEntity<List<LabelValueVo>> orderType() {
List<LabelValueVo> result = new ArrayList<>();
public ResponseEntity<List<Map>> orderType() {
List<Map> result = new ArrayList<>();
List<BmFormStruc> list = iBmFormStrucService.list(new QueryWrapper<BmFormStruc>()
.likeRight("form_desc","出库")
.select("form_type","form_name"));
for (BmFormStruc formStruc : list) {
result.add(new LabelValueVo(formStruc.getForm_name(), formStruc.getForm_type()));
result.add(MapOf.of("text",formStruc.getForm_name(),"value",formStruc.getForm_type()));
}
return new ResponseEntity<>(result,HttpStatus.OK);
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
View File

@@ -37,8 +37,6 @@ public class PmFormDataController {
@GetMapping()
@Log("查询数据")
public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
}

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
View File

@@ -78,7 +78,11 @@ public class PmFormData implements Serializable {
*/
private BigDecimal qty;
/**
* 分配数量
* 数量
*/
private BigDecimal plan_qty;
/**
* 已分配数量
*/
private BigDecimal assign_qty;

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
View File

@@ -36,6 +36,8 @@
<result property="create_time" column="create_time"/>
<result property="material_id" column="material_id"/>
<result property="qty" column="qty"/>
<result property="assign_qty" column="assign_qty"/>
<result property="plan_qty" column="plan_qty"/>
<result property="pcsn" column="pcsn"/>
<result property="material_code" column="material_code"/>
<result property="material_name" column="material_name"/>

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java
View File

@@ -104,7 +104,11 @@ public class PmFormDataDto implements Serializable {
*/
private BigDecimal qty;
/**
* 分配数量
* 数量
*/
private BigDecimal plan_qty;
/**
* 已分配数量
*/
private BigDecimal assign_qty;

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
View File

@@ -128,7 +128,6 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
}
}
}
return result;
}
@@ -162,7 +161,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
@Override
public com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> queryTree(FormDataQuery query, PageQuery pageQuery) {
Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
Page page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
page.setOrderBy("id DESC");
List<PmFormDataDto> pmFormDataDtos = this.baseMapper.queryTree(query);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal());
@@ -232,7 +231,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
formMap.put(item.getString("value"), item);
}, HashMap::putAll);
//基础字段
Set<String> fields = ListOf.ofSet(formStruc.getBiz_code(), formStruc.getBiz_id(), formStruc.getBiz_code(), formStruc.getBiz_status(), formStruc.getMaterial_id(), formStruc.getPcsn(), formStruc.getVehicle_code(), formStruc.getVehicle_id(),formStruc.getUnit_id(), formStruc.getQty());
Set<String> fields = ListOf.ofSet(formStruc.getBiz_code(), formStruc.getBiz_id(), formStruc.getBiz_code(), formStruc.getBiz_status(), formStruc.getMaterial_id(), formStruc.getPcsn(), formStruc.getVehicle_code(), formStruc.getVehicle_id(),formStruc.getUnit_id(), formStruc.getQty(),formStruc.getPlan_qty(),formStruc.getAssign_qty());
JSONObject data = fieldMapping(fields, fieldMapping, sourceData);
data.put("form_type",formStruc.getForm_type());