bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

numlog

This commit is contained in:
sxu 2024-08-02 15:14:56 +08:00
parent 10282de5ef
commit 4d54331c02
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java
View File

@ -129,4 +129,10 @@ public class BmNumLogs extends BaseEntity {
private String parentId;
private String inputNum;
@Excel(name = "http返回消息")
private String msg;
@Excel(name = "http返回码")
private String code;
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java
View File

@ -138,7 +138,7 @@ public class LeaseOutDetailsController extends BaseController {
*
* @param parentId
*/
@Log(title = "出库单查询", businessType = BusinessType.MATERIAL)
@Log(title = "出库单查询", businessType = BusinessType.QUERY)
@GetMapping("/getOutboundOrder")
public AjaxResult getOutboundOrder(String parentId) {
startPage();

8
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -776,7 +776,7 @@
LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
WHERE
bcd.parent_id=#{parentId} and bcd.type_id=#{typeId}
and bcd.back_status='1' and bcd.is_finished is null
and bcd.back_status='1' and (bcd.is_finished is null or bcd.is_finished != 1)
</select>
<select id="getWxList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@ -796,7 +796,7 @@
LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
WHERE
bcd.parent_id=#{parentId} and bcd.type_id=#{typeId}
and bcd.back_status='2' and bcd.is_finished is null
and bcd.back_status='2' and (bcd.is_finished is null or bcd.is_finished != 1)
</select>
<select id="getBfList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@ -819,7 +819,7 @@
LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
WHERE
bcd.parent_id=#{parentId} and bcd.type_id=#{typeId}
and bcd.back_status='3' and bcd.is_finished is null
and bcd.back_status='3' and (bcd.is_finished is null or bcd.is_finished != 1)
</select>
<select id="codeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@ -950,7 +950,7 @@
LEFT JOIN back_apply_info bai ON bai.id = bcd.parent_id
LEFT JOIN tm_task_agreement tta ON tta.task_id = bai.task_id
WHERE
bcd.parent_id = #{parentId} and bcd.type_id=#{typeId} and bcd.is_finished is null
bcd.parent_id = #{parentId} and bcd.type_id=#{typeId} and (bcd.is_finished is null or bcd.is_finished != 1)
GROUP By bcd.type_id,bcd.ma_id
</select>
<select id="getBackMachine" resultType="com.bonus.sgzb.app.domain.TmTask">

9
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java
View File

@ -38,12 +38,17 @@ public class BmNumLogsService{
record.setTypeModelName(des.getTypeModelName());
record.setPreNum(des.getPreNum()); //领料申请数量、退料申请数量
record.setAuditNum(des.getAuditNum()); //领料审核数量、但自2024/8/1退料无审核环节
record.setInputNum(des.getInputNum()); //输入数量
record.setPreStoreNum(des.getNum()); //操作前库存数
record.setInNum(des.getInNum()); //入库数
record.setOutNum(des.getOutNum()); // 出库数
record.setBackNum(des.getBackNum()); //退料数
record.setManageType(des.getManageType());
record.setTaskId(des.getTaskId());
record.setTypeId(des.getTypeId());
record.setPreStoreNum(des.getNum()); //操作前库存数
record.setInputNum(des.getInputNum()); //输入数量
BmNumLogs msgCode = objectMapper.readValue(record.getJsonResult(), BmNumLogs.class);
record.setCode(msgCode.getCode());
record.setStatus("200".equals(msgCode.getCode()) ? 0 : 1); //http返回状态码
} catch (JsonProcessingException e) {
//[{"auditNum":null,"createBy":"1","id":1790,"inputNum":1,"manageType":1,"outNum":1.0,"parentId":657,"preNum":null,"taskId":2082,"typeId":121,"typeModelName":"5T（博大）","typeName":"马达头"}]
log.error("解析日志对象失败:{}", record.getDescription());

6
sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml
View File

@ -73,12 +73,14 @@
insert into bm_num_logs (model_title, `method`, task_id, type_id,
description, json_result, create_time, creator, remark,
pre_num, input_num, out_num, audit_num, manage_type,
type_name, type_model_name, pre_store_num
type_name, type_model_name, pre_store_num, in_num,
back_num, `status`
)
values (#{modelTitle,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR}, #{typeId,jdbcType=INTEGER},
#{description,jdbcType=VARCHAR}, #{jsonResult,jdbcType=VARCHAR}, now(), #{creator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
#{preNum,jdbcType=VARCHAR}, #{inputNum,jdbcType=VARCHAR}, #{outNum,jdbcType=VARCHAR}, #{auditNum,jdbcType=VARCHAR}, #{manageType,jdbcType=VARCHAR},
#{typeName,jdbcType=VARCHAR}, #{typeModelName,jdbcType=VARCHAR}, #{preStoreNum,jdbcType=VARCHAR}
#{typeName,jdbcType=VARCHAR}, #{typeModelName,jdbcType=VARCHAR}, #{preStoreNum,jdbcType=VARCHAR}, #{inNum,jdbcType=VARCHAR},
#{backNum,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}
)
</insert>