8/26 耗材加入工位预警数量 是否拆零

workplace
wangwei 10 months ago
parent 5e215abf0a
commit 4a79d728e2

@ -1,118 +0,0 @@
package com.glxp.api.controller.basic;
import cn.hutool.core.text.split.SplitIter;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.auth.SysWorkplace;
import com.glxp.api.entity.basic.BasicCollectBustypeEntity;
import com.glxp.api.req.basic.BasicCollectBusTypeRequest;
import com.glxp.api.req.basic.WorkBindBusTypeRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.BasicCollectBusTypeResponse;
import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
import com.glxp.api.res.basic.WorkBindWorkResponse;
import com.glxp.api.service.auth.SysWorkplaceService;
import com.glxp.api.service.basic.BasicCollectBustypeService;
import com.glxp.api.service.basic.SysWorkplaceDocumentService;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Random;
/**
* @author : zhuhzu
* @date : 2024/8/13 9:49
* @modyified By :
*/
@Slf4j
@RestController
public class BasicCollectBusTypeController {
@Resource
private BasicCollectBustypeService basicCollectBustypeService;
@Resource
SysWorkplaceService sysWorkplaceService;
@Resource
private SysWorkplaceDocumentService sysWorkplaceDocumentService;
@GetMapping("/udiwms/basic/collectBusType/getList")
public BaseResponse page(BasicCollectBusTypeRequest request) {
List<BasicCollectBusTypeResponse> page = basicCollectBustypeService.filterList(request);
PageInfo<BasicCollectBusTypeResponse> pageInfo = new PageInfo<>(page);
PageSimpleResponse<BasicCollectBusTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(page);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/basic/collectPoints/addCollectBusType")
public BaseResponse addCollectBusType(@RequestBody BasicCollectBustypeEntity entity) {
BasicCollectBustypeEntity one = basicCollectBustypeService.getOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getFromBusTypeCode, entity.getFromBusTypeCode()));
if (one != null){
return ResultVOUtils.error("来源单据类型编号重复");
}
entity.setId(IdUtil.getSnowflakeNextId());
entity.setCreateTime(new Date());
entity.setUpdateTime(new Date());
boolean save = basicCollectBustypeService.save(entity);
if (!save){
return ResultVOUtils.error("新增错误");
}
return ResultVOUtils.success("新增成功");
}
@PostMapping("/udiwms/basic/collectPoints/updateCollectBusType")
public BaseResponse updateCollectPoint(@RequestBody BasicCollectBustypeEntity entity) {
entity.setUpdateTime(new Date());
boolean save = basicCollectBustypeService.updateById(entity);
if (!save){
return ResultVOUtils.error("更新错误");
}
return ResultVOUtils.success("更新成功!!");
}
@PostMapping("/udiwms/basic/collectPoints/delCollectBusType")
public BaseResponse delCollectPoint(@RequestBody BasicCollectBustypeEntity entity) {
// List<SysWorkplace> list = sysWorkplaceService.getBasicCollectBusTypeList(entity.getCode());
// if(list.size() > 0){
// return ResultVOUtils.error("当前单据已绑定工位,请先进行解绑!");
// }
WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
workBindBusTypeRequest.setDocumentTypeCode(entity.getFromDocumentType());
List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
if (sysWorkplaceDocumentResponses.size() > 0) {
return ResultVOUtils.error("当前单据类型已被绑定,请解绑之后在删除");
}
boolean del = basicCollectBustypeService.removeById(entity);
if (!del){
return ResultVOUtils.error("删除错误");
}
return ResultVOUtils.success("成功!!!!!");
}
@PostMapping("/udiwms/basic/collectBusType/genCode")
public BaseResponse genCode() {
// String code = "SP";
String code = basicCollectBustypeService.genCode();
return ResultVOUtils.success(code);
}
}

@ -382,6 +382,7 @@ public class UdiRelevanceController extends BaseController {
udiProductEntity.setMatrial(udiRelevanceSaveRequest.getMatrial());
udiProductEntity.setRequireScanCode(udiRelevanceSaveRequest.getRequireScanCode());
udiProductEntity.setFlbm(udiRelevanceSaveRequest.getFlbm());
udiProductEntity.setWorkPlaceCount(udiRelevanceSaveRequest.getWorkPlaceCount());
// udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
if (StrUtil.isNotEmpty(udiRelevanceSaveRequest.getOriginUuid())) {
udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);

@ -22,7 +22,6 @@ import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.collect.CollectOrderCodeManResponse;
import com.glxp.api.service.auth.SysWorkplaceService;
import com.glxp.api.service.basic.BasicCollectBustypeService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.collect.IoCollectOrderBizService;
import com.glxp.api.service.collect.IoCollectOrderCodeManService;
@ -63,8 +62,6 @@ public class IoCollectOrderCodeManController extends BaseController {
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
BasicCollectBustypeService bustypeService;
@Resource
SysWorkplaceService sysWorkPlaceService;
/**

@ -507,6 +507,10 @@ public class BasicProductsEntity {
private String majorStatus;
//工位预警数量
@TableField(value = "workPlaceCount")
private Integer workPlaceCount;

@ -326,6 +326,13 @@ public class UdiProductEntity {
@TableField(value = "bhsycjsl")
private Integer bhsycjsl;
//工位预警数量
@TableField(value = "workPlaceCount")
private Integer workPlaceCount;
public Integer getMyBhxjsl() {
if (bhxjsl == null || bhxjsl == 0)
return 1;

@ -166,4 +166,7 @@ public class UdiRelevanceSaveRequest {
private String useLevelDi;
private String useLevelUnit;
private Integer useLeverCount;
//工位预警数
private Integer workPlaceCount;
}

@ -252,6 +252,11 @@ public class UdiRelevanceResponse {
* 使
*/
private Integer bhsycjsl;
/**
*
*/
private Integer workPlaceCount;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
return 1;

@ -794,6 +794,9 @@
<if test="requireScanCode != null">
requireScanCode=#{requireScanCode},
</if>
<if test="workPlaceCount != null">
workPlaceCount=#{workPlaceCount},
</if>
</trim>
where uuid = #{uuid}
</update>

@ -586,6 +586,7 @@
basic_products.majorType,
basic_products.medicareType,
basic_products.requireScanCode,
basic_products.workPlaceCount,
th.hsmc hslbName
FROM basic_products
inner JOIN basic_udirel

@ -4250,4 +4250,8 @@ CALL Pro_Temp_ColumnWork('io_collect_order', 'backupOrderRemark5',
1);
CALL Pro_Temp_ColumnWork('io_collect_order', 'backupOrderRemark6',
'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''备注字段6''',
1);
1);
CALL Pro_Temp_ColumnWork('basic_products', 'workPlaceCount',
'int NULL DEFAULT NULL COMMENT ''工位预警数量''',
1);

Loading…
Cancel
Save