diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java index c999ff9b..da184031 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java @@ -5,16 +5,10 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.app.domain.AppPendingStorage; import com.ruoyi.app.service.IAppPendingStorageService; +import com.ruoyi.common.annotation.Anonymous; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -29,6 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @author ruoyi * @date 2025-02-22 */ +@Anonymous @RestController @RequestMapping("/system/storage") public class AppPendingStorageController extends BaseController @@ -103,4 +98,15 @@ public class AppPendingStorageController extends BaseController { return toAjax(appPendingStorageService.deleteAppPendingStorageByRecordIds(recordIds)); } + + @Log(title = "空载具入库码盘", businessType = BusinessType.INSERT) + @PostMapping("/addEmpty") + public AjaxResult addEmpty(@RequestParam String vehicleNo) { + return toAjax(appPendingStorageService.addAppEmptyPmsOrderIn(vehicleNo)); + } + + @PostMapping("/addOtherList") + public AjaxResult addOtherList(@RequestBody List appPendingStorageList) { + return toAjax(appPendingStorageService.addAppListPmsOrderIn(appPendingStorageList)); + } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 9fe874a7..ccd91577 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -114,7 +114,7 @@ public class SecurityConfig requests.antMatchers("/login", "/register", "/captchaImage").permitAll() // 静态资源,可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn","/app/task/sendLocation", "/app/task/taskResult","/app/task/kk").permitAll() + .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn","/app/task/sendLocation", "/app/task/taskResult","/app/task/kk", "/system/storage/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); }) diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPendingStorage.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPendingStorage.java index fdd8c645..14a06700 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPendingStorage.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPendingStorage.java @@ -43,6 +43,9 @@ public class AppPendingStorage extends BaseEntity @Excel(name = "物料数量") private BigDecimal goodsNum; + @Excel(name = "载具号") + private String vehicleNo; + /** 物料条码 */ @Excel(name = "物料条码") private String goodsCode; @@ -211,6 +214,14 @@ public class AppPendingStorage extends BaseEntity return createPerson; } + public String getVehicleNo() { + return vehicleNo; + } + + public void setVehicleNo(String vehicleNo) { + this.vehicleNo = vehicleNo; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -234,4 +245,26 @@ public class AppPendingStorage extends BaseEntity .append("remark", getRemark()) .toString(); } + + public AppPendingStorage(String recordId, String listId, Long orderType, String customerId, String orderId, String vehicleNo, String goodsId, BigDecimal goodsNum, String goodsCode, String goodsDesc, String unit, String spare1, String spare2, Long status, Long storageType, String createPerson, String remark) { + this.goodsDesc = goodsDesc; + this.recordId = recordId; + this.listId = listId; + this.orderType = orderType; + this.customerId = customerId; + this.orderId = orderId; + this.vehicleNo = vehicleNo; + this.goodsId = goodsId; + this.goodsNum = goodsNum; + this.goodsCode = goodsCode; + this.unit = unit; + this.spare1 = spare1; + this.spare2 = spare2; + this.status = status; + this.storageType = storageType; + this.createPerson = createPerson; + } + + public AppPendingStorage() { + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPendingStorageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPendingStorageMapper.java index 9a49d8ac..7a2b8023 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPendingStorageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPendingStorageMapper.java @@ -60,4 +60,12 @@ public interface AppPendingStorageMapper * @return 结果 */ public int deleteAppPendingStorageByRecordIds(String[] recordIds); + + /** + * 插入入库列表 + * + * @param appPendingStorageList + * @return 结果 + */ + public int insertAppPendingStorageList(List appPendingStorageList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java index 97e6f747..9e9acefd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.app.mapper; +import com.ruoyi.app.domain.AppPendingStorage; import com.ruoyi.app.domain.AppPmsOrderIn; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPendingStorageService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPendingStorageService.java index 26b6800e..02fb62c4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPendingStorageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPendingStorageService.java @@ -60,4 +60,19 @@ public interface IAppPendingStorageService * @return 结果 */ public int deleteAppPendingStorageByRecordId(String recordId); + + /** + * 添加空载具入库码盘信息 + * + * @param vehicleNo 载具号 + * @return 结果 + */ + public int addAppEmptyPmsOrderIn(String vehicleNo); + + /** 添加物料列表入库 + * + * @param appPendingStorageList 载具号 + * @return 结果 + */ + public int addAppListPmsOrderIn(List appPendingStorageList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java index 0a4690ab..a4ded2f0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java @@ -1,11 +1,14 @@ package com.ruoyi.app.service.impl; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; import com.ruoyi.app.domain.AppPendingStorage; import com.ruoyi.app.mapper.AppPendingStorageMapper; import com.ruoyi.app.service.IAppPendingStorageService; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.uuid.UUID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -95,4 +98,38 @@ public class AppPendingStorageServiceImpl implements IAppPendingStorageService { return appPendingStorageMapper.deleteAppPendingStorageByRecordId(recordId); } + + @Override + public int addAppEmptyPmsOrderIn(String vehicleNo) { + AppPendingStorage appPendingStorage = new AppPendingStorage( + UUID.randomUUID().toString(), + "S001", + 1L, + "0001", + "OD0001", + vehicleNo, + "1122", + BigDecimal.valueOf(200), + "4545666", + "铅笔", + "支", + "test1", + "test2", + 2L, + 1L, + "empty", + "test" + ); + if (appPendingStorage.getCreateTime() == null) { + appPendingStorage.setCreateTime(DateUtils.getNowDate()); + } + if (appPendingStorage.getUpdateTime() == null) { + appPendingStorage.setUpdateTime(DateUtils.getNowDate()); + } + return appPendingStorageMapper.insertAppPendingStorage(appPendingStorage); + } + + public int addAppListPmsOrderIn(List appPendingStorageList) { + return appPendingStorageMapper.insertAppPendingStorageList(appPendingStorageList); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java index b5bc7307..962e915c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java @@ -92,5 +92,4 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService { return appPmsOrderInMapper.deleteAppPmsOrderInByListId(listId); } - } diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml index d1e815d0..60f45959 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml @@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -62,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order_type, customer_id, order_id, + vehicle_no, goods_id, goods_num, goods_code, @@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{orderType}, #{customerId}, #{orderId}, + #{vehicleNo}, #{goodsId}, #{goodsNum}, #{goodsCode}, @@ -132,4 +135,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + + INSERT INTO app_pending_storage + + + record_id, + list_id, + order_type, + customer_id, + order_id, + vehicle_no, + goods_id, + goods_num, + goods_code, + goods_desc, + unit, + spare1, + spare2, + status, + storage_type, + create_time, + create_person, + update_time, + remark, + + + VALUES + + + #{record.recordId}, + #{record.listId}, + #{record.orderType}, + #{record.customerId}, + #{record.orderId}, + #{record.vehicleNo}, + #{record.goodsId}, + #{record.goodsNum}, + #{record.goodsCode}, + #{record.goodsDesc}, + #{record.unit}, + #{record.spare1}, + #{record.spare2}, + #{record.status}, + #{record.storageType}, + #{record.createTime}, + #{record.createPerson}, + #{record.updateTime}, + #{record.remark}, + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml index 2b685807..1f699a7f 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml @@ -24,6 +24,27 @@ + + + + + + + + + + + + + + + + + + + + + select list_id, order_type, customer_id, order_id, goods_id, goods_num, used_num, remaining_num, goods_code, goods_desc, unit, spare1, spare2, order_status, create_time, update_time, remark from app_pms_order_in @@ -127,4 +148,51 @@ #{listId} + + + insert into app_pending_storage + + record_id, + list_id, + order_type, + customer_id, + order_id, + vehicle_no, + goods_id, + goods_num, + goods_code, + goods_desc, + unit, + spare1, + spare2, + status, + storage_type, + create_time, + create_person, + update_time, + remark, + + + #{recordId}, + #{listId}, + #{orderType}, + #{customerId}, + #{orderId}, + #{vehicleNo}, + #{goodsId}, + #{goodsNum}, + #{goodsCode}, + #{goodsDesc}, + #{unit}, + #{spare1}, + #{spare2}, + #{status}, + #{storageType}, + #{createTime}, + #{createPerson}, + #{updateTime}, + #{remark}, + + + \ No newline at end of file