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

no message

main
HUOJIN\92525 2024-06-26 18:02:52 +08:00
parent ae7f78db63
commit e1409df173
9 changed files with 120 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youchain-system/src/main/java/com/youchain/appupdate/inputJson/BindStock.java
View File

@ -11,7 +11,7 @@ public class BindStock {
@ApiModelProperty(value = "容器编号") @ApiModelProperty(value = "容器编号")
String stockCode; String stockCode;
@ApiModelProperty(value = "物料编号") @ApiModelProperty(value = "MO票")
String itemCode; String itemCode;
@ApiModelProperty(value = "点位编号") @ApiModelProperty(value = "点位编号")

34
youchain-system/src/main/java/com/youchain/appupdate/rest/BydAppController.java
View File

@ -29,6 +29,24 @@ public class BydAppController {
private final StockService stockService; private final StockService stockService;
@PostMapping("/materialIn")
@Log("原材料入库")
@ApiOperation("原材料入库")
@AnonymousAccess
public ResponseEntity<Object> materialIn(@RequestBody BindStock bindStock) {
try {
//二维码格式：P:A17A;V:148795;M:DP_001/PCS;B:240512JFET;Lot:20240427;S:124051200181131;PO:5913490946/00020;Q:36/20/32;D:2024-04-27;SN:;YX:2025-04-26;DN:D12405120005031AS
String QRCode = bindStock.getItemCode();//Mo票二维码
String stockCode = bindStock.getStockCode();//容器编号
String pointCode = bindStock.getPointCode();//点位编号
stockService.bindContainer(QRCode, stockCode, pointCode);
} catch (Exception e) {
return badRequest(e.getMessage());
}
return successRequest("入库成功!");
}
@PostMapping("/containerIn") @PostMapping("/containerIn")
@Log("容器入场") @Log("容器入场")
@ApiOperation("容器入场") @ApiOperation("容器入场")
@ -60,22 +78,6 @@ public class BydAppController {
return successRequest("出场成功!"); return successRequest("出场成功!");
} }
@PostMapping("/materialIn")
@Log("原材料入库")
@ApiOperation("原材料入库")
@AnonymousAccess
public ResponseEntity<Object> materialIn(@RequestBody BindStock bindStock) {
try {
//二维码格式：P:A17A;V:148795;M:DP_001/PCS;B:240512JFET;Lot:20240427;S:124051200181131;PO:5913490946/00020;Q:36/20/32;D:2024-04-27;SN:;YX:2025-04-26;DN:D12405120005031AS
String QRCode = bindStock.getItemCode();//Mo票二维码
String stockCode = bindStock.getStockCode();//容器编号
String pointCode = bindStock.getPointCode();//点位编号
stockService.bindContainer(QRCode, stockCode, pointCode);
} catch (Exception e) {
return badRequest(e.getMessage());
}
return successRequest("入库成功!");
}
@PostMapping("/callAssemblyLine") @PostMapping("/callAssemblyLine")
@Log("装配线叫料") @Log("装配线叫料")

4
youchain-system/src/main/java/com/youchain/businessdata/repository/PickRepository.java
View File

@ -31,8 +31,8 @@ public interface PickRepository extends JpaRepository<Pick, Long>, JpaSpecificat
@Query(value = "SELECT p FROM Pick p WHERE p.id=?1 and p.lineNo=?2") @Query(value = "SELECT p FROM Pick p WHERE p.id=?1 and p.lineNo=?2")
List<Pick> findRepeat(long gdDetailId, int no); List<Pick> findRepeat(long gdDetailId, int no);
@Query(value = " FROM Pick p WHERE p.status=?1 ") @Query(value = " FROM Pick p WHERE p.status in :status order by p.createTime,p.lineNo ")
List<Pick> findByPickStatus(String status); List<Pick> findByPickStatus(List<String> status);
@Query(value = " FROM Pick p WHERE p.code=?1 and p.code=?2 and p.code=?3 ") @Query(value = " FROM Pick p WHERE p.code=?1 and p.code=?2 and p.code=?3 ")
Pick findByPick(String gdNo, String completeCode, String station); Pick findByPick(String gdNo, String completeCode, String station);

63
youchain-system/src/main/java/com/youchain/businessdata/service/GdService.java
View File

@ -1,18 +1,18 @@
/* /*
* Copyright 2019-2020 Zheng Jie * Copyright 2019-2020 Zheng Jie
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.youchain.businessdata.service; package com.youchain.businessdata.service;
import com.youchain.RequestData.Yclbl; import com.youchain.RequestData.Yclbl;
@ -20,29 +20,32 @@ import com.youchain.businessdata.domain.Gd;
import com.youchain.businessdata.service.dto.GdDto; import com.youchain.businessdata.service.dto.GdDto;
import com.youchain.businessdata.service.dto.GdQueryCriteria; import com.youchain.businessdata.service.dto.GdQueryCriteria;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import java.util.Map; import java.util.Map;
import java.util.List; import java.util.List;
import java.io.IOException; import java.io.IOException;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* @website https://eladmin.vip * @author huojin
* @description 服务接口 * @website https://eladmin.vip
* @author huojin * @description 服务接口
* @date 2024-06-06 * @date 2024-06-06
**/ **/
public interface GdService { public interface GdService {
/** /**
* 查询数据分页 * 查询数据分页
*
* @param criteria 条件 * @param criteria 条件
* @param pageable 分页参数 * @param pageable 分页参数
* @return Map<String,Object> * @return Map<String, Object>
*/ */
Map<String,Object> queryAll(GdQueryCriteria criteria, Pageable pageable); Map<String, Object> queryAll(GdQueryCriteria criteria, Pageable pageable);
/** /**
* 查询所有数据不分页 * 查询所有数据不分页
*
* @param criteria 条件参数 * @param criteria 条件参数
* @return List<GdDto> * @return List<GdDto>
*/ */
@ -50,6 +53,7 @@ public interface GdService {
/** /**
* 根据ID查询 * 根据ID查询
*
* @param id ID * @param id ID
* @return GdDto * @return GdDto
*/ */
@ -57,6 +61,7 @@ public interface GdService {
/** /**
* 创建 * 创建
*
* @param resources / * @param resources /
* @return GdDto * @return GdDto
*/ */
@ -64,31 +69,41 @@ public interface GdService {
/** /**
* 编辑 * 编辑
*
* @param resources / * @param resources /
*/ */
void update(Gd resources); void update(Gd resources);
/** /**
* 多选删除 * 多选删除
*
* @param ids / * @param ids /
*/ */
void deleteAll(Long[] ids); void deleteAll(Long[] ids);
/** /**
* 导出数据 * 导出数据
*
* @param all 待导出的数据 * @param all 待导出的数据
* @param response / * @param response /
* @throws IOException / * @throws IOException /
*/ */
void download(List<GdDto> all, HttpServletResponse response) throws IOException; void download(List<GdDto> all, HttpServletResponse response) throws IOException;
Gd createGd(String orderNo, String taskCode, String station);
/** 根据工单，申城出库明细*/ /**
void addPickDetail(Gd gd); * 创建工单
*
* @param orderNo 订单号
* @param taskCode 任务代码
* @param station 工位
* @return Gd
*/
Gd createGd(String orderNo, String taskCode, String station);
/** /**
* 原材料备料 * 原材料备料
*
* @param yclbl 原材料备料 * @param yclbl 原材料备料
*/ */
void materialBL(Yclbl yclbl); void materialBL(Yclbl yclbl);

2
youchain-system/src/main/java/com/youchain/businessdata/service/PickDetailService.java
View File

@ -127,8 +127,6 @@ public interface PickDetailService {
PickDetail createPickDetail(Item item, String po); PickDetail createPickDetail(Item item, String po);
void save(Pick pick);
/** /**
* 创建出库单明细 * 创建出库单明细
* *

78
youchain-system/src/main/java/com/youchain/businessdata/service/impl/GdDetailServiceImpl.java
View File

@ -1,18 +1,18 @@
/* /*
* Copyright 2019-2020 Zheng Jie * Copyright 2019-2020 Zheng Jie
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.youchain.businessdata.service.impl; package com.youchain.businessdata.service.impl;
import com.youchain.basicdata.domain.BigItem; import com.youchain.basicdata.domain.BigItem;
@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.io.IOException; import java.io.IOException;
@ -39,11 +40,11 @@ import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
/** /**
* @website https://eladmin.vip * @author huojin
* @description 服务实现 * @website https://eladmin.vip
* @author huojin * @description 服务实现
* @date 2024-06-06 * @date 2024-06-06
**/ **/
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class GdDetailServiceImpl implements GdDetailService { public class GdDetailServiceImpl implements GdDetailService {
@ -53,21 +54,21 @@ public class GdDetailServiceImpl implements GdDetailService {
private final DeptService deptService; private final DeptService deptService;
@Override @Override
public Map<String,Object> queryAll(GdDetailQueryCriteria criteria, Pageable pageable){ public Map<String, Object> queryAll(GdDetailQueryCriteria criteria, Pageable pageable) {
Page<GdDetail> page = gdDetailRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); Page<GdDetail> page = gdDetailRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
return PageUtil.toPage(page.map(gdDetailMapper::toDto)); return PageUtil.toPage(page.map(gdDetailMapper::toDto));
} }
@Override @Override
public List<GdDetailDto> queryAll(GdDetailQueryCriteria criteria){ public List<GdDetailDto> queryAll(GdDetailQueryCriteria criteria) {
return gdDetailMapper.toDto(gdDetailRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); return gdDetailMapper.toDto(gdDetailRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder)));
} }
@Override @Override
@Transactional @Transactional
public GdDetailDto findById(Long id) { public GdDetailDto findById(Long id) {
GdDetail gdDetail = gdDetailRepository.findById(id).orElseGet(GdDetail::new); GdDetail gdDetail = gdDetailRepository.findById(id).orElseGet(GdDetail::new);
ValidationUtil.isNull(gdDetail.getId(),"GdDetail","id",id); ValidationUtil.isNull(gdDetail.getId(), "GdDetail", "id", id);
return gdDetailMapper.toDto(gdDetail); return gdDetailMapper.toDto(gdDetail);
} }
@ -81,7 +82,7 @@ public class GdDetailServiceImpl implements GdDetailService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void update(GdDetail resources) { public void update(GdDetail resources) {
GdDetail gdDetail = gdDetailRepository.findById(resources.getId()).orElseGet(GdDetail::new); GdDetail gdDetail = gdDetailRepository.findById(resources.getId()).orElseGet(GdDetail::new);
ValidationUtil.isNull( gdDetail.getId(),"GdDetail","id",resources.getId()); ValidationUtil.isNull(gdDetail.getId(), "GdDetail", "id", resources.getId());
gdDetail.copy(resources); gdDetail.copy(resources);
gdDetailRepository.save(gdDetail); gdDetailRepository.save(gdDetail);
} }
@ -97,7 +98,7 @@ public class GdDetailServiceImpl implements GdDetailService {
public void download(List<GdDetailDto> all, HttpServletResponse response) throws IOException { public void download(List<GdDetailDto> all, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
for (GdDetailDto gdDetail : all) { for (GdDetailDto gdDetail : all) {
Map<String,Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("创建人", gdDetail.getCreateBy()); map.put("创建人", gdDetail.getCreateBy());
map.put("修改人", gdDetail.getUpdateBy()); map.put("修改人", gdDetail.getUpdateBy());
map.put("创建时间", gdDetail.getCreateTime()); map.put("创建时间", gdDetail.getCreateTime());
@ -112,29 +113,4 @@ public class GdDetailServiceImpl implements GdDetailService {
} }
FileUtil.downloadExcel(list, response); FileUtil.downloadExcel(list, response);
} }
@Override
public GdDetail save(int lineNo,Gd gd, String orderType, BigItem bigItem, Double completeQty, Item item, Double itemQty,Double orderQty) {
GdDetail gdDetail= new GdDetail();
List<GdDetail> gdList;
if (orderType.equals(BaseStatus.GD_TYPE_DP)){
gdList=gdDetailRepository.findRepeat(gd.getId(),null,item.getId(),BaseStatus.GD_TYPE_DP);
}else {
gdList=gdDetailRepository.findRepeat(gd.getId(),bigItem.getId(),item.getId(),BaseStatus.GD_TYPE_CT);
}
if (gdList.size()>0){
gdDetail=gdList.get(0);
}
gdDetail.setGd(gd);
gdDetail.setLineNo(lineNo);
gdDetail.setItem(item);
gdDetail.setItemQty(itemQty);
gdDetail.setOrderQty(orderQty);
gdDetail.setBigItem(bigItem);
gdDetail.setBigItemQty(completeQty);
gdDetail.setDept(deptService.getDefaultDept());
gdDetail.setOrderType(orderType);
gdDetailRepository.save(gdDetail);
return gdDetail;
}
} }

30
youchain-system/src/main/java/com/youchain/businessdata/service/impl/GdServiceImpl.java
View File

@ -150,35 +150,7 @@ public class GdServiceImpl implements GdService {
return gd; return gd;
} }
@Override
public void addPickDetail(Gd gd) {
int no = 1;// 序号
while (true) {
List<GdDetail> gdDetailList = gdDetailRepository.findByGdAndQty(gd.getId());
if (gdDetailList.size() < 1) {
break;
} else {
List<Integer> arr = new ArrayList<Integer>();//已分配过的行号
for (GdDetail gdDetail : gdDetailList) {
/*本次循环已拆分过 工单明细行*/
if (arr.contains(gdDetail.getLineNo())) {
continue;
}
/*生成出库单*/
Pick pick = pickService.save(gdDetail, no);
/* 去重*/
arr.add(gdDetail.getLineNo());
no = no + 1;
/*生成出库明细*/
pickDetailService.save(pick);
/*添加 默认目标备料点位*/
Point point = pointRepository.getById(2195l);
pick.setPoint(point);
pickRepository.save(pick);
}
}
}
}
/** /**
* 原材料备料 * 原材料备料

47
youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickDetailServiceImpl.java
View File

@ -133,10 +133,8 @@ public class PickDetailServiceImpl implements PickDetailService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public synchronized String allocate(long id, double quantity, String areaName, Point endPoint) { public synchronized String allocate(long id, double quantity, String areaCode, Point endPoint) {
if (areaName == null) {
areaName = "大件存储区,小件存储区";
}
PickDetailDto pickDetailDto = findById(id); PickDetailDto pickDetailDto = findById(id);
PickDetail pd = toEntity(pickDetailDto);//Dto转实体 PickDetail pd = toEntity(pickDetailDto);//Dto转实体
ItemDto itemDto = pickDetailDto.getItem(); ItemDto itemDto = pickDetailDto.getItem();
@ -148,7 +146,7 @@ public class PickDetailServiceImpl implements PickDetailService {
if (pd.getAllocatedQty() >= pd.getOrderQty()) { if (pd.getAllocatedQty() >= pd.getOrderQty()) {
return pick.getCode() + "出库单;" + item.getCode() + "数量已分配！"; return pick.getCode() + "出库单;" + item.getCode() + "数量已分配！";
} }
List<Inventory> Inventorys = inventoryService.queryInventory(item.getId(), areaName); List<Inventory> Inventorys = inventoryService.queryInventory(item.getId(), areaCode);
if (Inventorys.isEmpty()) { if (Inventorys.isEmpty()) {
return pick.getCode() + "出库单;" + item.getCode() + "物料库存不足，请先补充库存！"; return pick.getCode() + "出库单;" + item.getCode() + "物料库存不足，请先补充库存！";
} }
@ -323,42 +321,6 @@ public class PickDetailServiceImpl implements PickDetailService {
return d; return d;
} }
@Override
public void save(Pick pick) {
List<GdDetail> gdDetailList;
if (pick != null) {
/* 成套物料 */
gdDetailList = gdDetailRepository.findByBigItem(pick.getId());
} else {
/* 单品物料*/
gdDetailList = new ArrayList<>();
}
for (GdDetail gdDetail : gdDetailList) {
int fb = 1;//封包系数
PickDetail pickDetail = new PickDetail();
List<PickDetail> pickDetailList = pickDetailRepository.findRepeat(pick.getId(), gdDetail.getItem().getId());
if (pickDetailList.size() > 0) {
pickDetail = pickDetailList.get(0);
}
pickDetail.setDept(UserUtils.isDept);
pickDetail.setStatus(BizStatus.OPEN);
pickDetail.setPick(pick);
pickDetail.setItem(gdDetail.getItem());
if (gdDetail.getBigItem() == null) {
/*如果为单品物料 默认封包系数10*/
fb = 10;
pickDetail.setOrderQty(1d * fb);
} else {
pickDetail.setOrderQty(gdDetail.getItemQty() * fb);
}
pickDetail.setLineNo(fb);
pickDetailRepository.save(pickDetail);
/*更新待拆分数量*/
gdDetail.setOrderQty(gdDetail.getOrderQty() - pickDetail.getOrderQty());
gdDetailRepository.save(gdDetail);
}
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void createPickDetail(Pick pick, List<GdDetail> gdDetails) { public void createPickDetail(Pick pick, List<GdDetail> gdDetails) {
@ -399,9 +361,10 @@ public class PickDetailServiceImpl implements PickDetailService {
List<String> MsgList = new ArrayList<>();//存放提示信息 List<String> MsgList = new ArrayList<>();//存放提示信息
//查询出待分配的pickDetail //查询出待分配的pickDetail
String areaCode=AreaNameDic.XJQ+","+AreaNameDic.DJQ;
List<PickDetail> pickDetails = pickDetailRepository.findByPickDetailNoAllocate(pick.getId()); List<PickDetail> pickDetails = pickDetailRepository.findByPickDetailNoAllocate(pick.getId());
for (PickDetail pickDetail : pickDetails) { for (PickDetail pickDetail : pickDetails) {
MsgList.add(allocate(pickDetail.getId(), pickDetail.getOrderQty(), null, endPoint)); MsgList.add(allocate(pickDetail.getId(), pickDetail.getOrderQty(), areaCode, endPoint));
} }
/* 更新出库单状态并写入目标点位*/ /* 更新出库单状态并写入目标点位*/

11
youchain-system/src/main/java/com/youchain/modules/quartz/task/pickTask.java
View File

@ -19,10 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
/** /**
@ -55,8 +52,8 @@ public class pickTask {
* 定时检测出库单，分配库存 * 定时检测出库单，分配库存
*/ */
public void allocatePick() { public void allocatePick() {
List<String> statuses = Arrays.asList(BizStatus.OPEN, BizStatus.ASSIGN);
List<Pick> pickList = pickRepository.findByPickStatus(BizStatus.OPEN); List<Pick> pickList = pickRepository.findByPickStatus(statuses);
if (pickList.isEmpty()) { if (pickList.isEmpty()) {
throw new RuntimeException("无待分配的出库单!"); throw new RuntimeException("无待分配的出库单!");
} else { } else {
@ -72,7 +69,7 @@ public class pickTask {
*/ */
public void pickAgvTask() { public void pickAgvTask() {
/*查询分配完成的出库单*/ /*查询分配完成的出库单*/
List<Pick> pickList = pickRepository.findByPickStatus(BizStatus.ALLOCATE); List<Pick> pickList = null;//pickRepository.findByPickStatus(BizStatus.ALLOCATE);
for (Pick pick : pickList) { for (Pick pick : pickList) {
List<Task> taskList = taskRepository.findByPick(pick.getId()); List<Task> taskList = taskRepository.findByPick(pick.getId());
for (Task task : taskList) { for (Task task : taskList) {