From 4ce057c4fb86253d38b51a5d9f8dd0d04b605a0b Mon Sep 17 00:00:00 2001 From: yinq Date: Sat, 16 Mar 2024 14:25:30 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20PDA=E8=A1=A5=E6=89=93=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E3=80=81=E8=A7=A3=E7=BB=91SN=E6=88=90=E5=93=81?= =?UTF-8?q?=E7=A0=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/PdaApiController.java | 34 ++++++++++++++- .../aucma/api/mapper/PdaBindingMapper.java | 17 ++++++++ .../aucma/api/service/IPdaBindingService.java | 17 ++++++++ .../api/service/impl/PdaServiceImpl.java | 41 +++++++++++++++++++ .../resources/mapper/PdaBindingMapper.xml | 13 +++++- .../framework/config/SecurityConfig.java | 1 + 6 files changed, 120 insertions(+), 3 deletions(-) diff --git a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java index bacac69..b6cb64b 100644 --- a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java +++ b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java @@ -6,6 +6,7 @@ import com.aucma.api.service.IPdaBindingService; import com.aucma.base.domain.BaseProcessStation; import com.aucma.base.service.IBaseProcessStationService; import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.utils.SecurityUtils; import com.aucma.common.utils.StringUtils; import com.aucma.report.domain.ReportQualityInspection; import com.aucma.report.service.IMaterialCompletionService; @@ -105,8 +106,8 @@ public class PdaApiController { inspection.setIsFlag(1L); } //检测人 - inspection.setInspectorCode(checkInfo.getUserName()); -// inspection.setInspectorCode(SecurityUtils.getUsername()); +// inspection.setInspectorCode(checkInfo.getUserName()); + inspection.setInspectorCode(SecurityUtils.getUsername()); inspection.setInspectorTime(new Date()); inspection.setStationCode(checkInfo.getStationCode()); inspection.setGroupCode(checkInfo.getTeamCode()); @@ -175,4 +176,33 @@ public class PdaApiController { return success(qualityService.pdaQueryQuantityNumber(stationCode)); } + /** + * PDA补打条码 + * + * @param barCode + * @return + */ + @PostMapping("/rebarCode") + public AjaxResult rebarCode(String barCode) { + String result = service.rebarCode(barCode); + if (StringUtils.isEmpty(result)){ + return error("条码信息输入错误！"); + } + return success(result); + } + + /** + * PDA解绑条码 + * + * @param barCode + * @return + */ + @PostMapping("/unbindBarCode") + public AjaxResult unbindBarCode(String barCode) { + String result = service.unbindBarCode(barCode); + if (StringUtils.isEmpty(result)){ + return error("条码信息输入错误！"); + } + return success(result); + } } diff --git a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java index a527ba4..845ebb6 100644 --- a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java +++ b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java @@ -7,6 +7,7 @@ import com.aucma.report.domain.ReportQualityInspection; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.HashMap; import java.util.List; /** @@ -30,4 +31,20 @@ public interface PdaBindingMapper { List findCheckInfoByCode(String code); List checkSelectRepairInfo(String code); + + /** + * 查询箱体条码信息 + * @param code + * @return + */ + @DataSource(value = DataSourceType.SLAVE) + List> selectPrintBarcode(String code); + + /** + * PDA解绑条码 + * @param barCode + * @return + */ + @DataSource(value = DataSourceType.SLAVE) + int unbindBarCode(String barCode); } diff --git a/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java b/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java index 8aca7bc..2f758ae 100644 --- a/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java +++ b/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java @@ -23,4 +23,21 @@ public interface IPdaBindingService { List findCheckInfoByCode(String code); List checkSelectRepairInfo(String code); + + /** + * PDA补打条码 + * + * @param barCode + * @return + */ + public String rebarCode(String barCode); + + /** + * PDA解绑条码 + * + * @param barCode + * @return + */ + public String unbindBarCode(String barCode); + } diff --git a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java index 6b3aded..01984fa 100644 --- a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java +++ b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java @@ -3,10 +3,12 @@ package com.aucma.api.service.impl; import com.aucma.api.domain.dto.RepairSubmitInfoDto; import com.aucma.api.mapper.PdaBindingMapper; import com.aucma.api.service.IPdaBindingService; +import com.aucma.common.utils.StringUtils; import com.aucma.report.domain.ReportQualityInspection; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; /** @@ -53,4 +55,43 @@ public class PdaServiceImpl implements IPdaBindingService { public List checkSelectRepairInfo(String code) { return mapper.checkSelectRepairInfo(code); } + + /** + * PDA补打条码 + * @param barCode + * @return + */ + @Override + public String rebarCode(String barCode) { + String result = null; + if (StringUtils.isEmpty(barCode)){ + return null; + } + List> barcodeList = mapper.selectPrintBarcode(barCode); + if (barcodeList.size() > 0){ + // 维护条码补打记录表 + result = "请到条码打印机旁进行补打条码！"; + } + return result; + } + + /** + * PDA解绑条码 + * @param barCode + * @return + */ + @Override + public String unbindBarCode(String barCode) { + String result = null; + if (StringUtils.isEmpty(barCode)){ + return null; + } + List> barcodeList = mapper.selectPrintBarcode(barCode); + if (barcodeList.size() > 0){ + mapper.unbindBarCode(barCode); + result = "解绑条码成功！"; + } + return result; + } + } diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml index 0157286..843dc94 100644 --- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml +++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml @@ -19,7 +19,6 @@ where BOX_CODE = #{boxCode} - + + + + UPDATE CODE_BINDING + SET PRODUCT_CODE = NULL, RECORD_TIME2 = NULL + WHERE BOX_CODE = #{boxCode} + + \ No newline at end of file diff --git a/aucma-framework/src/main/java/com/aucma/framework/config/SecurityConfig.java b/aucma-framework/src/main/java/com/aucma/framework/config/SecurityConfig.java index bb1e76d..fefdc4d 100644 --- a/aucma-framework/src/main/java/com/aucma/framework/config/SecurityConfig.java +++ b/aucma-framework/src/main/java/com/aucma/framework/config/SecurityConfig.java @@ -127,6 +127,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter .antMatchers(HttpMethod.GET, "/base/teamMembers/**").permitAll() .antMatchers(HttpMethod.POST, "/webApi/electricalInspection").permitAll() .antMatchers(HttpMethod.POST, "/api/**").permitAll() + .antMatchers(HttpMethod.POST, "/report/**").permitAll() .antMatchers(HttpMethod.POST, "/**/**/**").permitAll() .antMatchers(HttpMethod.GET, "/**/**/**").permitAll() // 除上面外的所有请求全部需要鉴权认证