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

rev:修改单据出库校验

Browse Source
This commit is contained in:
zhangzq
2024-12-04 22:40:59 +08:00
parent ae414cfe0c
commit 2cc254ba28
7 changed files with 246 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,10 +2,16 @@ package org.nl.wms.pm_manage.form_data.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
@@ -39,6 +45,17 @@ public class PmFormDataController {
public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
}
@PutMapping()
@Log("修改单据结构")
public ResponseEntity<Object> update(@RequestBody JSONObject param){
//逻辑判断：如果有数据了则不允许修改
String s = param.toString(SerializerFeature.SortField);
PmFormData pmFormData = JSONObject.parseObject(s, PmFormData.class, Feature.OrderedField);
pmFormData.setUpdate_name(SecurityUtils.getCurrentUserId());
pmFormData.setUpdate_time(DateUtil.now());
iPmFormDataService.updateById(pmFormData);
return new ResponseEntity<>(HttpStatus.OK);
}
@DeleteMapping
@Transactional

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
View File

@@ -136,6 +136,9 @@
<if test="query.vehicle_code != null and query.vehicle_code != ''">
and struct.vehicle_code LIKE '%${query.vehicle_code}%'
</if>
<if test="query.stor_code != null and query.stor_code != ''">
and struct.stor_code = #{query.stor_code}
</if>
</where>
</select>
<select id="getStructIvtAssign" resultType="org.nl.wms.stor_manage.struct.service.dao.StructAssignQty">