diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBasketInfo.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBasketInfo.java index 4e43a16..7570e32 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBasketInfo.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBasketInfo.java @@ -12,7 +12,7 @@ import java.util.List; /** * 资产信息对象 base_basket_info * - * @author wenjy + * @author * @date 2024-07-19 */ public class BaseBasketInfo extends BaseEntity { @@ -92,6 +92,35 @@ public class BaseBasketInfo extends BaseEntity { // @Excel(name = "生产厂家", targetAttr = "manufacturerName", type = Excel.Type.EXPORT) private BaseManufacturer baseManufacturer; + // gps位置，提交换RFID + private String gpsLocation; + private String oldBasketEpc; + private String oldBasketEpc2; + + + public String getOldBasketEpc() { + return oldBasketEpc; + } + + public void setOldBasketEpc(String oldBasketEpc) { + this.oldBasketEpc = oldBasketEpc; + } + + public String getOldBasketEpc2() { + return oldBasketEpc2; + } + + public void setOldBasketEpc2(String oldBasketEpc2) { + this.oldBasketEpc2 = oldBasketEpc2; + } + + public String getGpsLocation() { + return gpsLocation; + } + + public void setGpsLocation(String gpsLocation) { + this.gpsLocation = gpsLocation; + } public List getLedgerInstantBindings() { return ledgerInstantBindings; diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBaseketChangeRfid.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBaseketChangeRfid.java index af49dba..4481184 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBaseketChangeRfid.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBaseketChangeRfid.java @@ -36,6 +36,17 @@ public class RecordBaseketChangeRfid extends BaseEntity // @Excel(name = "gpsW") private String gpsLocation; + private BaseBasketInfo baseBasketInfo; + + + public BaseBasketInfo getBaseBasketInfo() { + return baseBasketInfo; + } + + public void setBaseBasketInfo(BaseBasketInfo baseBasketInfo) { + this.baseBasketInfo = baseBasketInfo; + } + public String getGpsLocation() { return gpsLocation; } diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordBaseketChangeRfidMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordBaseketChangeRfidMapper.xml index 8a20df0..e58294a 100644 --- a/ruoyi-manager/src/main/resources/mapper/manager/RecordBaseketChangeRfidMapper.xml +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordBaseketChangeRfidMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -13,18 +13,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select objid, basket_id, basket_epc, basket_epc2, change_type, create_by, create_time,gps_location from record_baseket_change_rfid + + select objid, + basket_id, + rbcr.basket_epc, + rbcr.basket_epc2, + change_type, + create_by, + create_time, + gps_location, + basket_code, + basket_spe, + basket_type, + steel_grade, + self_code + from record_baseket_change_rfid rbcr + left join base_basket_info bbi on rbcr.basket_id = bbi.obj_id + + diff --git a/ruoyi-manager/src/main/resources/templates/manager/change_rfid/change_rfid.html b/ruoyi-manager/src/main/resources/templates/manager/change_rfid/change_rfid.html index 3944e09..93b8a8c 100644 --- a/ruoyi-manager/src/main/resources/templates/manager/change_rfid/change_rfid.html +++ b/ruoyi-manager/src/main/resources/templates/manager/change_rfid/change_rfid.html @@ -1,82 +1,89 @@ - + - + -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
+
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
- -
-
-
+ +
+
- - + }; + $.table.init(options); + }); + \ No newline at end of file diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java index 6b97bdc..95dc19e 100644 --- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java +++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java @@ -63,6 +63,8 @@ public class ApiController extends BaseController { private IBaseAirCodeService baseAirCodeService; @Autowired private IRecordDeliveryTaskWaybillService recordDeliveryTaskWaybillService;//进港接货 + @Autowired + private IRecordBaseketChangeRfidService recordBaseketChangeRfidService;//更换RFID记录 @PostMapping("/findBindingList") public AjaxResult findBindingList(String epc) { @@ -273,7 +275,7 @@ public class ApiController extends BaseController { setLocationInfo(gps); }}); // 插入任务子表 - recordDeliveryTaskWaybillService.updateRecord(taskCode,waybillNumber,cargoFrameEpc,basketId); + recordDeliveryTaskWaybillService.updateRecord(taskCode, waybillNumber, cargoFrameEpc, basketId); }); recordDeliveryTaskService.closeTaskByReceipt(taskCode, user, gps);//关闭任务 @@ -549,6 +551,48 @@ public class ApiController extends BaseController { return AjaxResult.success(list); } + // 更换RFID提交，记录添加 + @PostMapping("/changeBasketEpc") + public AjaxResult changeBasketEpc(@RequestBody BaseBasketInfo baseBasketInfo) { + // int tagCount = baseBasketInfoService.selectCountBasketByEpc(baseBasketInfo.getBasketEpc()); + // if (tagCount > 0) { + // return AjaxResult.error("RFID标签1已绑定"); + // } + // tagCount = baseBasketInfoService.selectCountBasketByEpc(baseBasketInfo.getBasketEpc2()); + // if (tagCount > 0) { + // return AjaxResult.error("RFID标签2已绑定"); + // } + + + int i = baseBasketInfoService.updateBaseBasketInfo(baseBasketInfo); + if (baseBasketInfo.getBasketEpc() != null) { + recordBaseketChangeRfidService.insertRecordBaseketChangeRfid(new RecordBaseketChangeRfid() {{ + setBasketId(baseBasketInfo.getObjId()); + setBasketEpc(baseBasketInfo.getOldBasketEpc()); + setBasketEpc2(baseBasketInfo.getBasketEpc()); + setChangeType("1"); + setGpsLocation(baseBasketInfo.getGpsLocation()); + setCreateBy(baseBasketInfo.getUpdatedBy()); + }}); + } + if (baseBasketInfo.getBasketEpc2() != null) { + + recordBaseketChangeRfidService.insertRecordBaseketChangeRfid(new RecordBaseketChangeRfid() {{ + setBasketId(baseBasketInfo.getObjId()); + setBasketEpc(baseBasketInfo.getOldBasketEpc2()); + setBasketEpc2(baseBasketInfo.getBasketEpc2()); + setChangeType("2"); + setGpsLocation(baseBasketInfo.getGpsLocation()); + setCreateBy(baseBasketInfo.getUpdatedBy()); + + }}); + } + + if (i > 0) return AjaxResult.success(); + return AjaxResult.error(); + + } + @GetMapping("/getVersion") public String getVersion() {