aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-06 16:39:44 +08:00
parent 895f2381f2
commit e9e475a13a
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemFaqController.java
View File

@ -51,7 +51,7 @@ public class EmisWaybillProblemFaqController extends EmisBaseController
/**
* 查询问题件FAG列表
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:list')")
// @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:list')")
@GetMapping("/list")
public TableDataInfo list(EmisWaybillProblemFaq emisWaybillProblemFaq)
{
@ -76,7 +76,7 @@ public class EmisWaybillProblemFaqController extends EmisBaseController
/**
* 获取问题件FAG详细信息
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:query')")
// @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@ -86,7 +86,7 @@ public class EmisWaybillProblemFaqController extends EmisBaseController
/**
* 新增问题件FAG
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:add')")
// @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:add')")
@Log(title = "问题件FAG", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody EmisWaybillProblemFaq emisWaybillProblemFaq)
@ -97,7 +97,7 @@ public class EmisWaybillProblemFaqController extends EmisBaseController
/**
* 修改问题件FAG
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:edit')")
// @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:edit')")
@Log(title = "问题件FAG", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody EmisWaybillProblemFaq emisWaybillProblemFaq)
@ -108,7 +108,7 @@ public class EmisWaybillProblemFaqController extends EmisBaseController
/**
* 删除问题件FAG
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:remove')")
// @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:remove')")
@Log(title = "问题件FAG", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

3
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -446,7 +446,8 @@ public class EmisWaybill extends BaseEntity
// private String billPicDispatchRmk;
private String billPicGoodsRmk;
// 是否已锁单 T
// 是否已锁单 T,锁单原因
private String lockFlag;
private String lockReason;
}

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -184,6 +184,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
boolean isLock=isWaybillLock(dbEmisWaybill);
if(isLock){
dbEmisWaybill.setLockFlag("T");
dbEmisWaybill.setLockReason("超时不允许修改(TimeOut)";
}else{
dbEmisWaybill.setLockFlag("F");
}

7
emis-biz/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml
View File

@ -22,7 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEmisWaybillProblemFaqList" parameterType="EmisWaybillProblemFaq" resultMap="EmisWaybillProblemFaqResult">
<include refid="selectEmisWaybillProblemFaqVo"/>
<where>
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="probId != null "> and prob_id = #{probId}</if>
<if test="billCode != null and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
@ -112,11 +113,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteEmisWaybillProblemFaqById" parameterType="Long">
delete from emis_waybill_problem_faq where id = #{id}
update emis_waybill_problem_faq set del_flag='1' where id = #{id}
</delete>
<delete id="deleteEmisWaybillProblemFaqByIds" parameterType="String">
delete from emis_waybill_problem_faq where id in
update emis_waybill_problem_faq set del_flag='1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>