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

Merge branch 'dev' into test

This commit is contained in:
zhouzy062 2024-01-30 13:57:31 +08:00
parent e1dc6d5512 8bf9558fc5
commit c1dc8fe5ec
6 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java
View File

@ -143,6 +143,7 @@ public class LeaseApplyDetails implements Serializable {
*/ */
@ApiModelProperty(value = "装备管理方式名称") @ApiModelProperty(value = "装备管理方式名称")
private String manageTypeName; private String manageTypeName;
private String maCode;
/** /**
* 实时库存 * 实时库存

3
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -516,11 +516,12 @@
SELECT SELECT
lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType, lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName, case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
FROM FROM
lease_apply_details lad lease_apply_details lad
LEFT JOIN ma_type mt ON lad.type_id = mt.type_id LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
WHERE WHERE
lad.parennt_id = #{record.id} AND lad.company_id = #{record.companyId} lad.parennt_id = #{record.id} AND lad.company_id = #{record.companyId}
</select> </select>

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
View File

@ -139,7 +139,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional(rollbackFor = Exception.class)
public int auditScrap(ScrapAudit scrapAudit) throws Exception { public int auditScrap(ScrapAudit scrapAudit) throws Exception {
String checkResult = scrapAudit.getCheckResult(); String checkResult = scrapAudit.getCheckResult();
List<ScrapApplyDetails> scrapDetailList = scrapAudit.getScrapDetailList(); List<ScrapApplyDetails> scrapDetailList = scrapAudit.getScrapDetailList();
@ -186,9 +186,9 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
List<ScrapApplyDetails> repairList = new ArrayList<>(); List<ScrapApplyDetails> repairList = new ArrayList<>();
if (scrapApplyDetailsList.size()>0){ if (scrapApplyDetailsList.size()>0){
for (ScrapApplyDetails bean : scrapApplyDetailsList){ for (ScrapApplyDetails bean : scrapApplyDetailsList){
if (bean.getScrapSource().equals("1")){ if ("1".equals(bean.getScrapSource())){
backList.add(bean); backList.add(bean);
}else if (bean.getScrapSource().equals("2")){ }else if ("2".equals(bean.getScrapSource())){
repairList.add(bean); repairList.add(bean);
} }
} }

1
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -350,7 +350,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="time != null and time != ''"> <if test="time != null and time != ''">
and bai.back_time =#{time} and bai.back_time =#{time}
</if> </if>
and bad.company_id = #{companyId}
GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
ORDER BY bai.create_time desc ORDER BY bai.create_time desc
</select> </select>

14
sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
View File

@ -228,16 +228,26 @@
<!-- 状态 <!-- 状态
37-待审核 37-待审核
38-已审核 --> 38-已审核 -->
<el-button type="text" v-if="scope.row.taskStatus == '37'"> <el-button type="text" v-if="scope.row.taskStatus == '37'">
待审核 待审核
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
style="color: #67c23a" style="color: #67c23a"
v-else-if="scope.row.taskStatus == '38'" v-if="scope.row.taskStatus == '38'"
> >
已审核 已审核
</el-button> </el-button>
<el-button type="text" v-if="scope.row.taskStatus == '39'">
退料核查
</el-button>
<el-button
type="text"
style="color: #67c23a"
v-if="scope.row.taskStatus == '40'"
>
退料完成
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

6
sgzb-ui/vue.config.js
View File

@ -38,9 +38,9 @@ module.exports = {
// target: `http://112.29.103.165:21626`,//线上环境-重庆 // target: `http://112.29.103.165:21626`,//线上环境-重庆
// target: `http://112.29.103.165:21624`,//线上环境-宁夏 // target: `http://112.29.103.165:21624`,//线上环境-宁夏
// target: `http://192.168.0.14:21624`,//线上环境 // target: `http://192.168.0.14:21624`,//线上环境
// target: `http://10.40.92.21:8080`, // target: `http://10.40.92.21:8080`,//超
// target: `http://10.40.92.13:8080`, target: `http://10.40.92.12:8080`,//韩
target: `http://10.40.92.220:8080`, // target: `http://10.40.92.220:8080`,//川
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {