huojin
/
Byd_Dg_Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加容器类型字典、物料类型字典、物料高度字典、物料翻包字典

main
HUOJIN\92525 2024-06-05 14:55:52 +08:00
parent 988991afae
commit 0e8c52fc4a
9 changed files with 205 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
youchain-system/src/main/java/com/youchain/basicdata/domain/Item.java
View File

@ -143,11 +143,6 @@ public class Item extends BaseEntity implements Serializable {
@ApiModelProperty(value = "来源序号")
private Long sourceId;
@OneToOne
@JoinColumn(name = "stock_type")
@ApiModelProperty(value = "料箱类型")
private StockType stockType;
@Column(name = "`extend_d1`")
@ApiModelProperty(value = "默认容器装载数")
private Double extendD1=1d;

5
youchain-system/src/main/java/com/youchain/basicdata/domain/Stock.java
View File

@ -77,10 +77,9 @@ public class Stock extends BaseEntity implements Serializable {
private String name;
@OneToOne
@JoinColumn(name = "type_id")
@Column(name = "`stock_type`")
@ApiModelProperty(value = "容器类型")
private StockType stockType;
private String stockType;
@Column(name = "`use_weight`")

2
youchain-system/src/main/java/com/youchain/basicdata/rest/ItemController.java
View File

@ -135,8 +135,6 @@ public class ItemController {
item.setCode(code);
item.setName("" + readAll.get(i).get("物料名称"));
//容器类型
String stocktype_Str = "" + readAll.get(i).get("容器类型");
item.setStockType(map_stock.get(stocktype_Str));
String unit=readAll.get(i).get("单位")+"";
item.setUnit(map_dic.get(unit).getValue());
String packNumber=readAll.get(i).get("默认容器装载数").toString().trim();

7
youchain-system/src/main/java/com/youchain/basicdata/rest/StockController.java
View File

@ -110,8 +110,7 @@ public class StockController {
for (Map<String, Object> record : readAll) {
String stockCode = record.get("代码").toString().trim();
String stockTypeCode = record.get("类型").toString().trim();
StockType stockType = redisObjectUtils.getObjectFromCache(stockTypeCode, () -> stockTypeService.findByCode(stockTypeCode), stockTypeCode + " 系统无此容器类型!");
String stockType = record.get("类型").toString().trim();
//判断是否已存在容器
if (existingStock.containsKey(stockCode)) {
@ -147,7 +146,7 @@ public class StockController {
}
private Stock createStock(StockType stockType, Dept dept, Map<String, Object> record) {
private Stock createStock(String stockType, Dept dept, Map<String, Object> record) {
Stock stock = new Stock();
stock.setCode(record.get("代码").toString().trim());
stock.setName(record.get("代码").toString().trim());
@ -158,7 +157,7 @@ public class StockController {
return stock;
}
private Stock updateStock(Stock stock, StockType stockType) {
private Stock updateStock(Stock stock, String stockType) {
stock.setStockType(stockType);
return stock;
}

4
youchain-system/src/main/java/com/youchain/basicdata/service/dto/StockDto.java
View File

@ -53,8 +53,8 @@ public class StockDto implements Serializable {
/** 容器名称 */
private String name;
/** 类型名称 */
private StockTypeSmallDto stockType;
/** 容器类型 */
private String stockType;
/** 容器使用重量 */

8
youchain-system/src/main/java/com/youchain/basicdata/service/dto/StockQueryCriteria.java
View File

@ -41,12 +41,8 @@ public class StockQueryCriteria{
private String status;
/** 容器类型代码 */
@Query(joinName = "stockType", propName="code",type = Query.Type.EQUAL)
private String stockTypeCode;
/** 容器类型名称 */
@Query(joinName = "stockType", propName="name",type = Query.Type.EQUAL)
private String stockTypeName;
@Query(type = Query.Type.INNER_LIKE)
private String stockType;
/** 点位code */
@Query(joinName = "point", propName="code",type = Query.Type.EQUAL)

1
youchain-system/src/main/java/com/youchain/basicdata/service/impl/BigBomServiceImpl.java
View File

@ -72,6 +72,7 @@ public class BigBomServiceImpl implements BigBomService {
@Override
@Transactional(rollbackFor = Exception.class)
public BigBomDto create(BigBom resources) {
return bigBomMapper.toDto(bigBomRepository.save(resources));
}

2
youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java
View File

@ -130,7 +130,7 @@ public class StockServiceImpl implements StockService {
map.put("地标ID", stock.getPoint().getName());
map.put("子容器数量", stock.getSubCount());
map.put("容器名称", stock.getName());
map.put("类型名称", stock.getStockType().getName());
map.put("容器类型", stock.getStockType());
map.put("容器使用重量", stock.getUseWeight());
map.put("容器使用体积", stock.getUseSize());
map.put("容器重量占用率", stock.getUsageWeight());

15
youchain-system/src/main/java/com/youchain/businessdata/rest/AsnDetailController.java
View File

@ -61,14 +61,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
/**
* @website https://eladmin.vip
* @author hjl
* @website https://eladmin.vip
* @date 2023-08-14
**/
@RestController
@ -126,6 +127,7 @@ public class AsnDetailController {
stockService.update(stock);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("采集MO票")
@ApiOperation("新增createMoInfo")
@PostMapping(value = "/createMoInfo")
@ -390,10 +392,7 @@ public class AsnDetailController {
if (st == null) {
return ApiResult.result(400, stockCode + "不存在或已使用", obj);
}
Item it=itemService.findByItemId(itemId);
if(!st.getStockType().getId().equals(it.getStockType().getId())){
return ApiResult.result(400,it.getCode()+"物料绑定容器类型不正确",obj);
}
Map<String, Object> map = new HashMap<>();
map.put("stockId", st.getId());
obj.putAll(map);
@ -445,7 +444,6 @@ public class AsnDetailController {
}
public ApiResult putawayConfirm(IRkInv rk) {
JSONObject obj = new JSONObject();
//查找容器是否有未完成记录
@ -487,6 +485,7 @@ public class AsnDetailController {
ApiResult r = createAsnDetail(cf);
return HttpUtils.handle(r);
}
public ApiResult createAsnDetail(IRkConfirm cf) {
AsnDetail asnDetail = new AsnDetail();
int j = 0;
@ -499,9 +498,7 @@ public class AsnDetailController {
Long stockId = cf.getStockId();
Item it = itemService.findByItemId(itemId);
Stock st = stockService.toEntity(stockService.findById(stockId));
if(!st.getStockType().getId().equals(it.getStockType().getId())){
return ApiResult.result(400,it.getCode()+"物料绑定容器类型不正确",null);
}
asnDetail.setPropC1(pc);
asnDetail.setPropC2(cjbh);
asnDetail.setOrderQty(qty);