diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java index edd109a..1629e3b 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java @@ -34,16 +34,16 @@ public class CribbinginfoDto implements Serializable { private String product_code; /** A长边 */ - private String AlongSide; + private String alongside; /** B短边 */ - private String BshortSide; + private String bshortside; /** H梯形高 */ - private String Htrapezoidal; + private String htrapezoidal; /** W厚度 */ - private String Wthickness; + private String wthickness; /** 当前垛盘数 */ private String tray_qty; diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java index 22665b0..6501735 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Pageable; + import java.util.List; import java.util.Map; @@ -25,47 +26,47 @@ import lombok.extern.slf4j.Slf4j; import cn.hutool.core.util.ObjectUtil; /** -* @description 服务实现 -* @author qinx -* @date 2022-09-26 -**/ + * @author qinx + * @description 服务实现 + * @date 2022-09-26 + **/ @Service @RequiredArgsConstructor @Slf4j public class CribbinginfoServiceImpl implements CribbinginfoService { @Override - public Map queryAll(Map whereJson, Pageable page){ - WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); - final JSONObject json = rb.pageResult(); - return json; + public Map queryAll(Map whereJson, Pageable page) { + WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); + final JSONObject json = rb.pageResult(); + return json; } @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CribbinginfoDto.class); - return null; + public List queryAll(Map whereJson) { + WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); + JSONArray arr = wo.query().getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CribbinginfoDto.class); + return null; } @Override public CribbinginfoDto findById(Long info_id) { WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); JSONObject json = wo.query("info_id = '" + info_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( CribbinginfoDto.class); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(CribbinginfoDto.class); } return null; } @Override - public CribbinginfoDto findByCode(String code) { + public CribbinginfoDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( CribbinginfoDto.class); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(CribbinginfoDto.class); } return null; } @@ -87,6 +88,10 @@ public class CribbinginfoServiceImpl implements CribbinginfoService { WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(dto)); + /*json.put("alongSide", dto.getAlongSide()); + json.put("BshortSide", dto.getBshortSide()); + json.put("Htrapezoidal", dto.getHtrapezoidal()); + json.put("Wthickness", dto.getWthickness());*/ wo.insert(json); } @@ -117,5 +122,5 @@ public class CribbinginfoServiceImpl implements CribbinginfoService { wo.delete("info_id = '" + info_id + "'"); } } - + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls index 36e7085..e301bf6 100644 Binary files a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls differ diff --git a/wms/qd/src/views/wms/Cribbing/index.vue b/wms/qd/src/views/wms/Cribbing/index.vue index e95ecc9..b96458b 100644 --- a/wms/qd/src/views/wms/Cribbing/index.vue +++ b/wms/qd/src/views/wms/Cribbing/index.vue @@ -20,16 +20,16 @@ - + - + - + - + @@ -204,10 +204,10 @@ - - - - + + + + @@ -286,7 +286,7 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import MaterDialog from '@/views/wms/st/in/MaterDialog' -const defaultForm = { info_id: null, material_id: null, material_code: null, material_name: null, material_spec: null, product_code: null, AlongSide: null, BshortSide: null, Htrapezoidal: null, Wthickness: null, tray_qty: null, tray_high: null, crib_category: null, palletX1_line: null, palletY1_row: null, palletA1_angle: null, palletX2_line: null, palletY2_row: null, palletA2_angle: null, palletX3_line: null, palletY3_row: null, palletA3_angle: null, pressCribX1_line: null, pressCribY1_row: null, pressCribA1_angle: null, pressCribX2_line: null, pressCribY2_row: null, pressCribA2_angle: null, pressCribX3_line: null, pressCribY3_row: null, pressCribA3_angle: null, Zoffset: null, pallet_layerQty: null, pressCrib_layerQty: null, codeLayerX1_interval: null, codeLayerY1_interval: null, codeLayerX2_interval: null, codeLayerY2_interval: null, codeLayerX3_interval: null, codeLayerY3_interval: null, codeLayerX1_offset: null, codeLayerY1_offset: null, codeLayerX2_offset: null, codeLayerY2_offset: null, codeLayerX3_offset: null, codeLayerY3_offset: null, pressLayerX1_interval: null, pressLayerY1_interval: null, pressLayerX2_interval: null, pressLayerY2_interval: null, pressLayerX3_interval: null, pressLayerY3_interval: null, pressLayerX1_offset: null, pressLayerY1_offset: null, pressLayerX2_offset: null, pressLayerY2_offset: null, pressLayerX3_offset: null, pressLayerY3_offset: null, one_cribTotal: null, two_cribTotal: null, one_qty: null, two_qty: null, tool_coordinate: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null } +const defaultForm = { info_id: null, material_id: null, material_code: null, material_name: null, material_spec: null, product_code: null, alongide: null, bshortside: null, htrapezoidal: null, wthickness: null, tray_qty: null, tray_high: null, crib_category: null, palletX1_line: null, palletY1_row: null, palletA1_angle: null, palletX2_line: null, palletY2_row: null, palletA2_angle: null, palletX3_line: null, palletY3_row: null, palletA3_angle: null, pressCribX1_line: null, pressCribY1_row: null, pressCribA1_angle: null, pressCribX2_line: null, pressCribY2_row: null, pressCribA2_angle: null, pressCribX3_line: null, pressCribY3_row: null, pressCribA3_angle: null, Zoffset: null, pallet_layerQty: null, pressCrib_layerQty: null, codeLayerX1_interval: null, codeLayerY1_interval: null, codeLayerX2_interval: null, codeLayerY2_interval: null, codeLayerX3_interval: null, codeLayerY3_interval: null, codeLayerX1_offset: null, codeLayerY1_offset: null, codeLayerX2_offset: null, codeLayerY2_offset: null, codeLayerX3_offset: null, codeLayerY3_offset: null, pressLayerX1_interval: null, pressLayerY1_interval: null, pressLayerX2_interval: null, pressLayerY2_interval: null, pressLayerX3_interval: null, pressLayerY3_interval: null, pressLayerX1_offset: null, pressLayerY1_offset: null, pressLayerX2_offset: null, pressLayerY2_offset: null, pressLayerX3_offset: null, pressLayerY3_offset: null, one_cribTotal: null, two_cribTotal: null, one_qty: null, two_qty: null, tool_coordinate: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null } export default { name: 'Cribbinginfo', components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog },