diff --git a/bgs-admin/src/main/java/com/bgs/web/controller/base/BaseLocationInfoController.java b/bgs-admin/src/main/java/com/bgs/web/controller/base/BaseLocationInfoController.java index 25b9791..d8dbb7d 100644 --- a/bgs-admin/src/main/java/com/bgs/web/controller/base/BaseLocationInfoController.java +++ b/bgs-admin/src/main/java/com/bgs/web/controller/base/BaseLocationInfoController.java @@ -154,17 +154,23 @@ public class BaseLocationInfoController extends BaseController @Autowired private ILedgerInstantBindingService ledgerInstantBindingService; + @PostMapping("/childList") @ResponseBody public TableDataInfo list(LedgerInstantBinding ledgerInstantBinding) { startPage(); + List list = ledgerInstantBindingService.selectLedgerInstantBindingList(ledgerInstantBinding); + return getDataTable(list); + } - /*if(StringUtils.isNotEmpty(ledgerInstantBinding.getCargoFrameEpc())){ - - }else { - return null; - }*/ + @GetMapping("/childList") + @ResponseBody + public TableDataInfo childList(String cargoFrameEpc) + { + LedgerInstantBinding ledgerInstantBinding = new LedgerInstantBinding(); + ledgerInstantBinding.setCargoFrameEpc(cargoFrameEpc); + startPage(); List list = ledgerInstantBindingService.selectLedgerInstantBindingList(ledgerInstantBinding); return getDataTable(list); } diff --git a/bgs-admin/src/main/resources/templates/base/location/stockLedger.html b/bgs-admin/src/main/resources/templates/base/location/stockLedger.html index 1c5eeff..0866a73 100644 --- a/bgs-admin/src/main/resources/templates/base/location/stockLedger.html +++ b/bgs-admin/src/main/resources/templates/base/location/stockLedger.html @@ -1,223 +1,299 @@ - + - + - + + +
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
+
+
+ +
+
    + +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
- -
- -
-
+ +
+
+
+ +
+
+
+
+
+
+
+
+
-
+ + - + \ No newline at end of file diff --git a/bgs-admin/src/main/resources/templates/base/location/stockLedger_Back.html b/bgs-admin/src/main/resources/templates/base/location/stockLedger_Back.html new file mode 100644 index 0000000..1c5eeff --- /dev/null +++ b/bgs-admin/src/main/resources/templates/base/location/stockLedger_Back.html @@ -0,0 +1,223 @@ + + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + diff --git a/bgs-system/src/main/java/com/bgs/system/domain/LedgerInstantBinding.java b/bgs-system/src/main/java/com/bgs/system/domain/LedgerInstantBinding.java index cdf56d8..92f29b9 100644 --- a/bgs-system/src/main/java/com/bgs/system/domain/LedgerInstantBinding.java +++ b/bgs-system/src/main/java/com/bgs/system/domain/LedgerInstantBinding.java @@ -33,6 +33,8 @@ public class LedgerInstantBinding extends BaseEntity @Excel(name = "绑定时间", width = 30, dateFormat = "yyyy-MM-dd") private Date crateTime; + private String locationCode; + public void setObjid(Long objid) { this.objid = objid; @@ -73,6 +75,14 @@ public class LedgerInstantBinding extends BaseEntity return crateTime; } + public String getLocationCode() { + return locationCode; + } + + public void setLocationCode(String locationCode) { + this.locationCode = locationCode; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml b/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml index 8af4ef7..25c30ef 100644 --- a/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml +++ b/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -16,11 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"