root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:印尼项目优化

Browse Source
This commit is contained in:
郑旭明\73939
2026-02-11 18:04:44 +08:00
parent 75afc80a64
commit 7ccf70c496
16 changed files with 705 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java
View File

@@ -347,79 +347,66 @@ public class PdmBiSubpackagerelation extends Model<PdmBiSubpackagerelation> {
/**
* 实际木箱重量
*/
@TableField(exist = false)
private String box_actual_net_weight;
/**
* 客户木箱唯一序列号
*/
@TableField(exist = false)
private String box_customer_sn;
/**
* 客户物料号
*/
@TableField(exist = false)
private String customer_material_code;
/**
* 客户物料名称
*/
@TableField(exist = false)
private String customer_material_desc;
/**
* 客户要求批号
*/
@TableField(exist = false)
private String customer_batch_number;
/**
* 子卷的客户卷号
*/
@TableField(exist = false)
private String customer_roll_name;
/**
* 子卷铝箔袋重量
*/
@TableField(exist = false)
private String roll_package_material_al_weight;
/**
* 子卷辅材重量
*/
@TableField(exist = false)
private String roll_fc_weight;
/**
* 子卷备注
*/
@TableField(exist = false)
private String roll_remark;
/**
* 净重合计
*/
@TableField(exist = false)
private BigDecimal total_net_weight;
/**
* 净重转换
*/
@TableField(exist = false)
private BigDecimal net_weight_convert;
/**
* 毛重转换
*/
@TableField(exist = false)
private BigDecimal gross_weight_convert;
/**
* 质保截止日期
*/
@TableField(exist = false)
private String warranty_expire_date;
/**
* 获取主键值

7
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java
View File

@@ -78,6 +78,13 @@ public interface IStIvtIostorinvdisService extends IService<StIvtIostorinvdis> {
*/
List<InBillPageVo> getInBillDatasNew(InBillPageParam paramMap);
/**
* 成品入库分页查询3
* @param paramMap 参数
* @param page 分页数据
* @return
*/
IPage<InBillPageVo> getInBillPage3(InBillPageParam paramMap, PageQuery page);
/**
* 成品出库分页查询

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java
View File

@@ -75,6 +75,8 @@ public interface StIvtIostorinvdisMapper extends BaseMapper<StIvtIostorinvdis> {
*/
IPage<InBillPageVo> selectPageLeftJoin(IPage<InBillPageVo> pages, InBillPageParam paramMap);
IPage<InBillPageVo> selectPageLeftJoin3(IPage<InBillPageVo> pages, InBillPageParam paramMap);
/**
* 查询成品入库全部分页数据
* @param pages

214
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml
View File

@@ -493,16 +493,11 @@
dis.struct_name,
mst.bill_type,
dis.box_no,
mater.material_code,
mater.material_name,
mb.material_name AS box_name,
dis.pcsn,
sub.sap_pcsn,
sub.net_weight,
dis.qty_unit_name,
sub.customer_name,
cust.sales_owner,
cust.cust_name,
sub.quanlity_in_box,
sub.customer_description,
sub.sale_order_name,
@@ -524,13 +519,7 @@
sub.net_weight_convert,
sub.gross_weight_convert,
sub.warranty_expire_date,
case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS
paper_type,
case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_material when plan.paper_tube_or_FRP = '2' then
plan.FRP_material end
AS paper_code,
case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then
plan.FRP_description end AS paper_name,
replace(CONCAT( sub.thickness_request, '*', sub.width_standard ),'.0','') AS spec,
sub.thickness,
sub.box_weight,
sub.length,
@@ -540,28 +529,9 @@
sub.demand_limit,
sub.standard_limit,
sub.actual_value,
(case when plan.parent_container_name <![CDATA[ <> ]]> '' then plan.parent_container_name else
plan.restruct_container_name end) AS parent_container_name,
mst.remark,
(case when DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '08:00:00' AND DATE_FORMAT(
mst.confirm_time, '%H:%i:%s' ) <![CDATA[ <= ]]> '19:59:59' then '白班'
when ((
DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '20:00:00' AND DATE_FORMAT( mst.confirm_time,
'%H:%i:%s' ) <![CDATA[ <= ]]> '23:59:59'
OR
DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '00:00:00' AND DATE_FORMAT( mst.confirm_time,
'%H:%i:%s' ) <![CDATA[ <= ]]> '07:59:59'
)) then '晚班' end) AS classes,
CONCAT( sub.box_length,'*',sub.box_width,'*',sub.box_high) AS box_size,
CASE
WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '08:00:00' AND DATE_FORMAT( mst.confirm_time,
'%H:%i:%s' ) <![CDATA[ <= ]]> '23:59:59'
THEN mst.confirm_time
WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '00:00:00' AND DATE_FORMAT( mst.confirm_time,
'%H:%i:%s' ) <![CDATA[ <= ]]> '07:59:59'
THEN DATE_SUB(mst.confirm_time,INTERVAL 1 day)
END AS confirm_time_class
sub.container_name,
CONCAT( sub.box_length,'*',sub.box_width,'*',sub.box_high) AS box_size
FROM
(
SELECT
@@ -612,28 +582,8 @@
) AS c
LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
-- LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id
LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
INNER JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn =
dis.box_no
LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
LEFT JOIN (SELECT
container_name,
MAX(paper_tube_or_FRP) AS paper_tube_or_FRP,
MAX(paper_tube_material) AS paper_tube_material,
MAX(paper_tube_description) AS paper_tube_description,
MAX(paper_tube_model) AS paper_tube_model,
MAX(FRP_material) AS FRP_material,
MAX(parent_container_name) AS parent_container_name,
MAX(restruct_container_name) AS restruct_container_name,
MAX(FRP_description) AS FRP_description,
MAX(FRP_model) AS FRP_model
FROM
pdm_bi_slittingproductionplan plan1
WHERE
plan1.is_delete = '0'
GROUP BY container_name) plan ON plan.container_name = sub.container_name
LEFT JOIN md_me_materialbase mb ON mb.material_code = sub.box_type
WHERE
mst.io_type = '0'
AND mst.is_delete = '0'
@@ -644,11 +594,161 @@
#{code}
</foreach>
</if>
<if test="paramMap.is_virtual == 0">
-- AND sect.sect_type_attr <![CDATA[ <> ]]> '09'
<if test="paramMap.product_area != null and !paramMap.product_area.isEmpty()">
AND LEFT(sub.container_name,2) IN
<foreach collection="paramMap.product_area" item="code" separator="," open="(" close=")">
#{code}
</foreach>
OR SUBSTRING(sub.container_name,2,2) IN
<foreach collection="paramMap.product_area" item="code" separator="," open="(" close=")">
#{code}
</foreach>
</if>
<if test="paramMap.is_virtual == 1">
-- AND sect.sect_type_attr = '09'
<if test="paramMap.thickness_request != null and paramMap.thickness_request != ''">
AND sub.thickness_request = #{paramMap.thickness_request}
</if>
<if test="paramMap.bill_type != null and paramMap.bill_type != '' and paramMap.bill_type == '0001'">
AND IFNULL(sub.sub_type,'') = ''
</if>
<if test="paramMap.sale_order_name != null and paramMap.sale_order_name != ''">
AND sub.sale_order_name = #{paramMap.sale_order_name}
</if>
<if test="paramMap.sap_pcsn != null and paramMap.sap_pcsn != ''">
AND sub.sap_pcsn = #{paramMap.sap_pcsn}
</if>
<if test="paramMap.bill_type != null and paramMap.bill_type != '' and paramMap.bill_type == '0007'">
AND sub.sub_type = '2'
</if>
<if test="paramMap.begin_time != null and paramMap.begin_time != ''">
AND mst.confirm_time <![CDATA[ >= ]]> #{paramMap.begin_time}
</if>
<if test="paramMap.end_time != null and paramMap.end_time != ''">
AND mst.confirm_time <![CDATA[ <= ]]> #{paramMap.end_time}
</if>
<if test="paramMap.with != null and paramMap.with != ''">
AND CONCAT( sub.thickness_request,'*',sub.width) = #{paramMap.with}
</if>
<if test="paramMap.classes == 1">
AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]>'08:00:00' AND DATE_FORMAT( mst.confirm_time,
'%H:%i:%s' ) <![CDATA[ <= ]]> '19:59:59'
</if>
<if test="paramMap.classes == 2">
AND (DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]>'20:00:00' AND DATE_FORMAT( mst.confirm_time,
'%H:%i:%s' ) <![CDATA[ <= ]]> '23:59:59'
OR
DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]>'00:00:00' AND DATE_FORMAT( mst.confirm_time,
'%H:%i:%s' ) <![CDATA[ <= ]]> '07:59:59')
</if>
ORDER BY mst.confirm_time DESC, dis.box_no
</select>
<select id="selectPageLeftJoin3" resultType="org.nl.wms.stat.service.vo.InBillPageVo">
SELECT
mst.stor_name,
dis.sect_name,
dis.struct_code,
dis.struct_name,
mst.bill_type,
dis.box_no,
dis.pcsn,
sub.sap_pcsn,
sub.net_weight,
dis.qty_unit_name,
sub.customer_name,
sub.quanlity_in_box,
sub.customer_description,
sub.sale_order_name,
mst.input_time,
mst.confirm_time,
sub.date_of_production,
mst.input_optname,
sub.width,
sub.box_actual_net_weight,
sub.box_customer_sn,
sub.customer_material_code,
sub.customer_material_desc,
sub.customer_batch_number,
sub.customer_roll_name,
sub.roll_package_material_al_weight,
sub.roll_fc_weight,
sub.roll_remark,
sub.total_net_weight,
sub.net_weight_convert,
sub.gross_weight_convert,
sub.warranty_expire_date,
sub.thickness,
sub.box_weight,
sub.length,
sub.thickness_request,
sub.width_standard,
sub.mass_per_unit_area,
sub.demand_limit,
sub.standard_limit,
sub.actual_value,
mst.remark,
sub.container_name,
replace(CONCAT( sub.thickness_request, '*', sub.width_standard ),'.0','') AS spec,
CONCAT( sub.box_length,'*',sub.box_width,'*',sub.box_high) AS box_size
FROM
(
SELECT
MIN( a.iostorinvdis_id ) AS iostorinvdis_id
FROM
st_ivt_iostorinvdis a
LEFT JOIN st_ivt_iostorinv b ON a.iostorinv_id = b.iostorinv_id
WHERE
b.io_type = '0'
<if test="paramMap.bill_type != null and paramMap.bill_type != ''">
AND b.bill_type = #{paramMap.bill_type}
</if>
<if test="paramMap.pcsn != null and paramMap.pcsn != ''">
AND a.pcsn = #{paramMap.pcsn}
</if>
<if test="paramMap.begin_time != null and paramMap.begin_time != ''">
AND b.confirm_time <![CDATA[ >= ]]> #{paramMap.begin_time}
</if>
<if test="paramMap.end_time != null and paramMap.end_time != ''">
AND b.confirm_time <![CDATA[ <= ]]> #{paramMap.end_time}
</if>
AND b.bill_status = '99'
GROUP BY
pcsn
UNION
SELECT
MIN( a.iostorinvdis_id ) AS iostorinvdis_id
FROM
st_ivt_iostorinvdis a
LEFT JOIN st_ivt_iostorinv b ON a.iostorinv_id = b.iostorinv_id
WHERE
b.io_type = '0'
<if test="paramMap.new_bill_type != null and paramMap.new_bill_type != ''">
AND b.bill_type = #{paramMap.new_bill_type}
</if>
<if test="paramMap.pcsn != null and paramMap.pcsn != ''">
AND a.pcsn = #{paramMap.new_bill_type}
</if>
<if test="paramMap.begin_time != null and paramMap.begin_time != ''">
AND b.confirm_time <![CDATA[ >= ]]> #{paramMap.begin_time}
</if>
<if test="paramMap.end_time != null and paramMap.end_time != ''">
AND b.confirm_time <![CDATA[ <= ]]> #{paramMap.end_time}
</if>
AND b.bill_status = '99'
GROUP BY
pcsn
) AS c
LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
INNER JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn =
dis.box_no
WHERE
mst.io_type = '0'
AND mst.is_delete = '0'
AND mst.bill_status = '99'
<if test="paramMap.stor_id != null and !paramMap.stor_id.isEmpty()">
AND mst.stor_id IN
<foreach collection="paramMap.stor_id" item="code" separator="," open="(" close=")">
#{code}
</foreach>
</if>
<if test="paramMap.product_area != null and !paramMap.product_area.isEmpty()">
AND LEFT(sub.container_name,2) IN

29
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java
View File

@@ -248,11 +248,32 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisM
paramMap.setBegin_time(today_begin_time);
paramMap.setEnd_time(today_end_time);
}
if ("0".equals(paramMap.getIs_all())) {
return stIvtIostorinvdisMapper.getInBillDataNew(paramMap);
} else {
return stIvtIostorinvdisMapper.getInBillAllData(paramMap);
return stIvtIostorinvdisMapper.getInBillDataNew(paramMap);
}
@Override
public IPage<InBillPageVo> getInBillPage3(InBillPageParam paramMap, PageQuery page) {
String begin_time = paramMap.getBegin_time();
String end_time = paramMap.getEnd_time();
if (ObjectUtil.isNotEmpty(paramMap.getBill_type())) {
paramMap.setNew_bill_type("0001".equals(paramMap.getBill_type()) ? "0007" : "-1");
}
// 处理时间
if (ObjectUtil.isNotEmpty(begin_time) && ObjectUtil.isNotEmpty(end_time)) {
String begin_time_today = begin_time.substring(0, 10);
String end_time_today = end_time.substring(0, 10);
// 开始时间
String today_begin_time = begin_time_today + " 08:00:00";
// 结束时间：19:59:59
DateTime parse = DateUtil.parse(end_time_today);
String substring = DateUtil.offsetDay(parse, 1).toString().substring(0, 10);
String today_end_time = substring + " 07:59:59";
paramMap.setBegin_time(today_begin_time);
paramMap.setEnd_time(today_end_time);
}
IPage<InBillPageVo> pages = new Page<>(page.getPage() + 1, page.getSize());
pages = stIvtIostorinvdisMapper.selectPageLeftJoin3(pages, paramMap);
return pages;
}

4
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -1461,9 +1461,13 @@ public class MesToLmsServiceImpl implements MesToLmsService {
PdmBiSubpackagerelation pdmBiSubpackagerelationUpdate = new PdmBiSubpackagerelation();
if (StrUtil.equals(BoxWeight, "0")) {
pdmBiSubpackagerelationUpdate.setTotal_net_weight(total_net_weight);
pdmBiSubpackagerelationUpdate.setNet_weight_convert(WeightUnitConverterUtil.convertKgToLbm(total_net_weight,2,RoundingMode.HALF_UP));
pdmBiSubpackagerelationUpdate.setBox_weight(NumberUtil.toBigDecimal(BoxWeight2));
pdmBiSubpackagerelationUpdate.setGross_weight_convert(WeightUnitConverterUtil.convertKgToLbm(NumberUtil.toBigDecimal(BoxWeight2),2,RoundingMode.HALF_UP));
} else {
pdmBiSubpackagerelationUpdate.setTotal_net_weight(NumberUtil.toBigDecimal(NetWeight));
pdmBiSubpackagerelationUpdate.setNet_weight_convert(WeightUnitConverterUtil.convertKgToLbm(NumberUtil.toBigDecimal(NetWeight),2,RoundingMode.HALF_UP));
pdmBiSubpackagerelationUpdate.setBox_weight(NumberUtil.toBigDecimal(BoxWeight));
pdmBiSubpackagerelationUpdate.setGross_weight_convert(WeightUnitConverterUtil.convertKgToLbm(NumberUtil.toBigDecimal(BoxWeight),2,RoundingMode.HALF_UP));
}

4
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelationrecord;
import org.nl.b_lms.pdm.subpackagerelation.service.IPdmBiSubpackagerelationrecordService;
@@ -156,6 +157,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
paramMap.setVbeln("");
paramMap.setFlag("1");
}
if (StringUtils.isNotBlank(paramMap.getBox_no())) {
paramMap.setFlag("1");
}
//获取人员对应的仓库
List<String> storIds = bsrealstorattrService.getStoreForUser(SecurityUtils.getCurrentUserId());
paramMap.setIn_stor_id(storIds);

6
lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java
View File

@@ -46,6 +46,12 @@ public class InBillQueryController {
return new ResponseEntity<>(TableDataInfo.build(inBillQueryService.getPage2(whereJson, page)), HttpStatus.OK);
}
@GetMapping(value = "/query3")
@Log("新查询3")
public ResponseEntity<Object> query3(InBillPageParam whereJson, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(inBillQueryService.getPage3(whereJson, page)), HttpStatus.OK);
}
@Log("导出数据")
@GetMapping(value = "/download")
public void download(@RequestParam Map map, HttpServletResponse response, String[] product_area) throws IOException {

2
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java
View File

@@ -66,6 +66,8 @@ public interface InBillQueryService {
IPage<InBillPageVo> getPage2(InBillPageParam whereJson, PageQuery page);
IPage<InBillPageVo> getPage3(InBillPageParam whereJson, PageQuery page);
/**
*
* @param whereJson

50
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
View File

@@ -190,6 +190,11 @@ public class InBillQueryServiceImpl implements InBillQueryService {
return iostorinvdisService.getInBillPage(whereJson, page);
}
@Override
public IPage<InBillPageVo> getPage3(InBillPageParam whereJson, PageQuery page) {
return iostorinvdisService.getInBillPage3(whereJson, page);
}
@Override
public List<PointDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("sch_base_point");
@@ -662,32 +667,31 @@ public class InBillQueryServiceImpl implements InBillQueryService {
for (int i = 0; i < inBillPageVos.size(); i++) {
InBillPageVo billPageVo = inBillPageVos.get(i);
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("成品卷号", billPageVo.getParent_container_name());
mp.put("入库日期", billPageVo.getConfirm_time());
mp.put("装箱日期", billPageVo.getDate_of_production().replace("-", "/"));
mp.put("客户名称", billPageVo.getCust_name());
mp.put("成品卷号 \nSub-roll number", billPageVo.getContainer_name());
mp.put("入库日期\nWarehousing date", billPageVo.getConfirm_time());
mp.put("装箱日期\nPacking date", billPageVo.getDate_of_production().replace("-", "/"));
mp.put("客户名称\nCustomer name", billPageVo.getCustomer_description());
try {
mp.put("订单号", billPageVo.getSale_order_name().substring(0, billPageVo.getSale_order_name().indexOf("-")));
mp.put("订单号\nPO number", billPageVo.getSale_order_name().substring(0, billPageVo.getSale_order_name().indexOf("-")));
} catch (Exception e) {
mp.put("订单号", billPageVo.getSale_order_name());
mp.put("订单号\nPO number", billPageVo.getSale_order_name());
}
mp.put("批号", billPageVo.getCustomer_batch_number());
mp.put("物料号", billPageVo.getCustomer_material_code());
mp.put("箱号", billPageVo.getBox_no());
mp.put("客户箱号/序列号", billPageVo.getBox_customer_sn() );
mp.put("客户卷号", billPageVo.getCustomer_roll_name());
mp.put("客户要求厚度", billPageVo.getThickness_request());
mp.put("客户要求幅宽", String.format("%.0f", Double.parseDouble(billPageVo.getWidth_standard())));
//怎么取 现在还不明确
mp.put("规格", billPageVo.getThickness_request());
mp.put("子卷净重", NumberUtil.round(StrUtil.isEmpty(billPageVo.getNet_weight()) ? "0" : billPageVo.getNet_weight(), 1));
mp.put("米数（长度）", NumberUtil.round(StrUtil.isEmpty(billPageVo.getLength()) ? "0" : billPageVo.getLength(), 1));
mp.put("净重合计",billPageVo.getTotal_net_weight());
mp.put("毛重合计", NumberUtil.round(StrUtil.isEmpty(billPageVo.getBox_weight()) ? "0" : billPageVo.getBox_weight(), 1));
mp.put("备注", "");
mp.put("净重转换",billPageVo.getNet_weight_convert());
mp.put("毛重转换",billPageVo.getGross_weight_convert());
mp.put("质保截止日期",billPageVo.getWarranty_expire_date());
mp.put("批号\nBatch number", billPageVo.getCustomer_batch_number());
mp.put("物料号\nMaterial number", billPageVo.getCustomer_material_code());
mp.put("箱号\nBox number", billPageVo.getBox_no());
mp.put("客户箱号/序列号\nCustomer Box number/Serial number", billPageVo.getBox_customer_sn() );
mp.put("客户卷号\nCustomer Roll Number", billPageVo.getCustomer_roll_name());
mp.put("客户要求厚度\n", billPageVo.getThickness_request());
mp.put("客户要求幅宽\n", billPageVo.getWidth_standard());
mp.put("规格\nSpec", billPageVo.getSpec());
mp.put("子卷净重\nRoll net weight", NumberUtil.round(StrUtil.isEmpty(billPageVo.getNet_weight()) ? "0" : billPageVo.getNet_weight(), 1));
mp.put("米数（长度）\nLength", NumberUtil.round(StrUtil.isEmpty(billPageVo.getLength()) ? "0" : billPageVo.getLength(), 1));
mp.put("净重合计\nTotal net weight",billPageVo.getTotal_net_weight());
mp.put("毛重合计\nTotal gross weight", NumberUtil.round(StrUtil.isEmpty(billPageVo.getBox_weight()) ? "0" : billPageVo.getBox_weight(), 1));
mp.put("备注\n", billPageVo.getRoll_remark());
mp.put("净重转换\nnet weight convert",billPageVo.getNet_weight_convert());
mp.put("毛重转换\ngross weight convert",billPageVo.getGross_weight_convert());
mp.put("质保截止日期\n",billPageVo.getWarranty_expire_date());
list.add(mp);
}

3
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/vo/InBillPageVo.java
View File

@@ -88,5 +88,6 @@ public class InBillPageVo {
private String net_weight_convert;
private String gross_weight_convert;
private String warranty_expire_date;
private String container_name;
private String spec;
}

19
lms/nladmin-system/src/main/resources/language/i18n/en.js
View File

@@ -49,6 +49,8 @@ var config = {
"mesErrorTitle": "MES Error"
},
"common": {
"warranty_expire_date":"warranty expire date",
"spec": "Specification",
"warehousing_time": "Warehousing Time",
"stock_age": "Stock Age",
"produce_age": "Production Duration (Days)",
@@ -573,6 +575,19 @@ var config = {
"pleaseSelectBusinessType": "Please select business type!",
"pleaseSelectWarehouse": "Please select warehouse!",
"doNotAllowAddingSameMaterial": "Adding the same material is not allowed!",
"instorgeDate": "Inbound Date",
"materialNumber": "Material Number",
"customerBoxNumber": "Customer Box Number/Serial Number",
"customerRollNumber": "Customer Roll Number",
"customerRequiredThickness": "Customer Required Thickness",
"subRollNetWeight": "Sub-Roll Net Weight",
"meterage": "Meterage (Length)",
"totalNetWeight": "Total Net Weight",
"totalGrossWeight": "Total Gross Weight",
"packingDate": "Packing Date",
"netWeightConvert": "Net Weight Conversion",
"grossWeightConvert": "Gross Weight Conversion",
"finishedProductRollNumber": "Finished Product Roll Number",
"outStorIdCannotBeEmpty": "Transfer in warehouse cannot be empty!"
},
"task": {
@@ -2820,7 +2835,9 @@ var config = {
"update_name": "Modifier",
"update_time": "Update Time",
"ext_id": "External ID",
"top_dept": "Top Department"
"top_dept": "顶级部门",
"parent_dept":"上级部门",
"select_dept_category":"选择部门类目"
},
"sys_dict": {
"code": "Code",

21
lms/nladmin-system/src/main/resources/language/i18n/id.js
View File

@@ -48,6 +48,8 @@ var config = {
"load_text5": "Hanya dapat mengunggah satu file excel!"
},
"common": {
"warranty_expire_date":"Tanggal Berakhir Garansi",
"spec": "Spesifikasi",
"warehousing_time": "Waktu Pemasukan Gudang",
"stock_age": "Usia Inventaris",
"produce_age": "Durasi Produksi (hari)",
@@ -572,6 +574,19 @@ var config = {
"pleaseSelectBusinessType": "Silakan pilih jenis bisnis!",
"pleaseSelectWarehouse": "Silakan pilih gudang!",
"doNotAllowAddingSameMaterial": "Tidak boleh menambahkan material yang sama!",
"instorgeDate": "Tanggal Masuk Gudang",
"materialNumber": "Nomor Material",
"customerBoxNumber": "Nomor Kotak/Nomor Seri Pelanggan",
"customerRollNumber": "Nomor Gulungan Pelanggan",
"customerRequiredThickness": "Ketebalan yang Diminta Pelanggan",
"subRollNetWeight": "Berat Bersih Sub-Gulungan",
"meterage": "Meteran (Panjang)",
"totalNetWeight": "Total Berat Bersih",
"totalGrossWeight": "Total Berat Kotor",
"packingDate": "Tanggal Pengepakan",
"netWeightConvert": "Konversi Berat Bersih",
"grossWeightConvert": "Konversi Berat Kotor",
"finishedProductRollNumber": "Nomor Gulungan Produk Jadi",
"outStorIdCannotBeEmpty": "Gudang masuk tidak boleh kosong!"
},
"task": {
@@ -2814,9 +2829,11 @@ var config = {
"is_used": "Status",
"name": "Nama",
"pid": "Departemen Atasan",
"sub_count": "Jumlah Sub Departemen",
"update_name": "Pengubah",
"update_time": "Waktu Pembaruan"
"update_time": "Waktu Pembaruan",
"top_dept": "Departemen Puncak",
"parent_dept": "Departemen Induk",
"select_dept_category": "Pilih Kategori Departemen"
},
"sys_dict": {
"code": "Kode",

21
lms/nladmin-system/src/main/resources/language/i18n/zh.js
View File

@@ -93,6 +93,8 @@ var config = {
"correspondingDeepLocationError": "对应的深货位错误!"
},
"common": {
"warranty_expire_date":"质保截止日期",
"spec":"规格",
"warehousing_time":"入库时间",
"stock_age":"库龄",
"produce_age":"生产时长（天）",
@@ -617,7 +619,20 @@ var config = {
"pleaseSelectBusinessType": "请选择业务类型！",
"pleaseSelectWarehouse": "请选择仓库！",
"doNotAllowAddingSameMaterial": "不允许添加相同物料！",
"outStorIdCannotBeEmpty": "移入仓库不能为空！"
"outStorIdCannotBeEmpty": "移入仓库不能为空！",
"instorgeDate": "入库日期",
"materialNumber": "物料号",
"customerBoxNumber": "客户箱号/序列号",
"customerRollNumber": "客户卷号",
"customerRequiredThickness": "客户要求厚度",
"subRollNetWeight": "子卷净重",
"meterage": "米数（长度）",
"totalNetWeight": "净重合计",
"totalGrossWeight": "毛重合计",
"packingDate": "装箱日期",
"netWeightConvert": "净重转换",
"grossWeightConvert": "毛重转换",
"finishedProductRollNumber": "成品卷号"
},
"task": {
"status": {
@@ -2864,7 +2879,9 @@ var config = {
"update_name": "修改者",
"update_time": "更新时间",
"ext_id": "外部标识",
"top_dept": "顶级部门"
"top_dept": "顶级部门",
"parent_dept":"上级部门",
"select_dept_category":"选择部门类目"
},
"sys_dict": {
"code": "编码",