BaoBingLin
/
nrwms_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
暴炳林 2024-10-11 11:48:01 +08:00
parent 18cc10b20e
commit 0d87781dc9
8 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youchain-system/src/main/java/com/youchain/basicdata/repository/PointRepository.java
View File

@ -63,4 +63,6 @@ public interface PointRepository extends JpaRepository<Point, Long>, JpaSpecific
@Query(value = "SELECT p FROM Point p WHERE (?1='' or p.area.name =?1)" +
" and p.code like CONCAT('',?2,'%')")
List<Point> findByLocations(String storageZone, String location);
@Query(value = "SELECT p FROM Point p WHERE p.id=?1")
Point fingById(Long id);
}

3
youchain-system/src/main/java/com/youchain/basicdata/rest/LampLogController.java
View File

@ -15,6 +15,7 @@
*/
package com.youchain.basicdata.rest;
import com.youchain.annotation.AnonymousAccess;
import com.youchain.annotation.Log;
import com.youchain.basicdata.domain.LampLog;
import com.youchain.basicdata.service.LampLogService;
@ -54,7 +55,7 @@ public class LampLogController {
@GetMapping
@Log("查询lamp_log")
@ApiOperation("查询lamp_log")
@PreAuthorize("@el.check('lampLog:list')")
@AnonymousAccess
public ResponseEntity<Object> queryLampLog(LampLogQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(lampLogService.queryAll(criteria,pageable),HttpStatus.OK);
}

8
youchain-system/src/main/java/com/youchain/businessdata/service/dto/TaskQueryCriteria.java
View File

@ -30,11 +30,11 @@ import com.youchain.annotation.Query;
public class TaskQueryCriteria{
/** 模糊 */
@Query(type = Query.Type.INNER_LIKE)
@Query(joinName = "srcPoint", propName="code",type = Query.Type.INNER_LIKE)
private String srcPointCode;
/** 模糊 */
@Query(type = Query.Type.INNER_LIKE)
@Query(joinName = "dstPoint", propName="code",type = Query.Type.INNER_LIKE)
private String dstPointCode;
/** 模糊 */
@ -45,10 +45,10 @@ public class TaskQueryCriteria{
@Query(type = Query.Type.INNER_LIKE)
private String dstLocCode;
@Query(joinName = "item", propName="code",type = Query.Type.INNER_LIKE)
@Query(joinName = "itemKey>item", propName="code",type = Query.Type.INNER_LIKE)
private String itemCode;
@Query(joinName = "item", propName="name",type = Query.Type.INNER_LIKE)
@Query(joinName = "itemKey>item", propName="name",type = Query.Type.INNER_LIKE)
private String itemName;
@Query(joinName = "asnDetail", propName="id",type = Query.Type.EQUAL)

3
youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java
View File

@ -511,6 +511,9 @@ public class TaskServiceImpl implements TaskService {
pointEnd.setStorageType(storageType);
}
pointRepository.save(pointEnd);
/*更新入库单状态*/
asnDetailService.receivingAsnDetail(asnDetail);
return ApiResult.result(200, "操作成功", billTypeCode);
}else {
/** 人工入库*/

5
youchain-system/src/main/java/com/youchain/modules/quartz/task/TestTask.java
View File

@ -174,11 +174,6 @@ public class TestTask {
BaseStatus.lengthVerifyList = JSONObject.parseArray(rfidVerify.getJSONArray("LengthList").toJSONString(),Long.class);
}
@Transactional
/*public void asnPutStart(){
Reader.READER_ERR err = RfidDocJava.startRfid();
System.out.println("开始扫描:"+err.toString());
}*/
public void asnPutaway(){
synchronized (BaseStatus.Lock.rfid_SJ) {
Reader.READER_ERR err = RfidDocJava.startRfid();

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

@ -7,6 +7,8 @@ import com.youchain.basicdata.repository.PointRepository;
import com.youchain.businessdata.domain.AgvTask;
import com.youchain.businessdata.repository.AgvTaskRepository;
import com.youchain.businessdata.service.AgvTaskService;
import com.youchain.exception.BadRequestException;
import com.youchain.exception.handler.ApiResult;
import com.youchain.utils.BaseStatus;
import com.youchain.utils.BizStatus;
import com.youchain.utils.HttpPostUtil;
@ -42,13 +44,17 @@ public class pickTask {
public void addAgvAsn() {
/* 生成RFID上架搬运任务*/
Point point=pointRepository.getById(BaseStatus.DoorPoint.getId());
ApiResult apiResult=null;
Point point=pointRepository.fingById(BaseStatus.DoorPoint.getId());
if (point.getStorageType().equals(BizStatus.LXZ_STO)){
/* 料箱入库*/
agvTaskService.addAgvAsn(BizStatus.RM_RK);
apiResult = agvTaskService.addAgvAsn(BizStatus.RM_RK);
}else if (point.getStorageType().equals(BizStatus.TP_STO)){
/* 半成品入库*/
agvTaskService.addAgvAsn(BizStatus.SM_RK);
apiResult = agvTaskService.addAgvAsn(BizStatus.SM_RK);
}
if (apiResult.getStatus()!=200){
throw new BadRequestException(point.getStorageType()+"/"+apiResult.getMessage());
}
}
public void pickTask() {

2
youchain-system/src/main/resources/config/application-dev.yml
View File

@ -13,7 +13,7 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:nrwms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: ${DB_USER:root}
password: ${DB_PWD:123456}
# password: ${DB_PWD:Youchain@56}

2
youchain-system/src/main/resources/config/application.yml
View File

@ -6,7 +6,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: dev
active: dock
jackson:
time-zone: GMT+8
data: