Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

余料退回明细表

Browse Source
master
赵嘉伟 3 years ago
parent af51295f35
commit 928b12de7f
6 changed files with 70 additions and 27 deletions
Show Stats Download Patch File Download Diff File

20
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusReturnController.java
Unescape Escape View File

@ -1,21 +1,14 @@
package com.foreverwin.mesnac.dispatch.controller;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.dispatch.service.SurplusReturnService;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.CommonMethods;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.RequestMapping;
import com.foreverwin.modular.core.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.foreverwin.mesnac.dispatch.service.SurplusReturnService;
import com.foreverwin.mesnac.dispatch.model.SurplusReturn;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
@ -72,4 +65,13 @@ public class SurplusReturnController {
return R.ok(0,"物料条码【" +inventory+ "】余料退回操作成功！");
}
@GetMapping("/surplusReturnTable")
public R surplusReturnTable(String item,String itemDescription){
try{
return R.ok(surplusReturnService.surplusReturnTable(item,itemDescription));
}catch(Exception e){
return R.failed(e.getMessage());
}
}
}

6
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusReturnMapper.java
Unescape Escape View File

@ -1,10 +1,11 @@
package com.foreverwin.mesnac.dispatch.mapper;
import com.foreverwin.mesnac.dispatch.model.SurplusReturn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.dispatch.model.SurplusReturn;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
/**
@ -26,4 +27,7 @@ public interface SurplusReturnMapper extends BaseMapper<SurplusReturn> {
* @return
*/
Map<String, Object> selectInventoryData(@Param("inventoryBo") String inventoryBo);
List<SurplusReturn> surplusReturnTable(@Param("site")String site, @Param("locale")String locale,
@Param("item")String item, @Param("itemDescription")String itemDescription);
}

23
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusReturn.java
Unescape Escape View File

@ -1,16 +1,14 @@
package com.foreverwin.mesnac.dispatch.model;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
/**
* <p>
@ -92,6 +90,9 @@ public class SurplusReturn extends Model<SurplusReturn> {
@TableField("MODIFIED_DATE_TIME")
private LocalDateTime modifiedDateTime;
@TableField(exist = false)
private String itemDescription;
public String getHandle() {
return handle;
@ -197,7 +198,15 @@ public class SurplusReturn extends Model<SurplusReturn> {
this.modifiedDateTime = modifiedDateTime;
}
public static final String HANDLE = "HANDLE";
public String getItemDescription() {
return itemDescription;
}
public void setItemDescription(String itemDescription) {
this.itemDescription = itemDescription;
}
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";

6
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusReturnService.java
Unescape Escape View File

@ -1,8 +1,10 @@
package com.foreverwin.mesnac.dispatch.service;
import com.foreverwin.mesnac.dispatch.model.SurplusReturn;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.mesnac.dispatch.model.SurplusReturn;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
@ -40,4 +42,6 @@ public interface SurplusReturnService extends IService<SurplusReturn> {
*/
void surplusReturn(String site, String user, String inventory, String length, String width, BigDecimal numbers, BigDecimal qty);
List<SurplusReturn> surplusReturnTable(String item,String itemDescription);
}

23
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.foreverwin.mesnac.dispatch.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.mesnac.common.constant.Constants;
import com.foreverwin.mesnac.common.dto.LabelPrintDto;
import com.foreverwin.mesnac.common.enums.HandleEnum;
@ -10,26 +10,24 @@ import com.foreverwin.mesnac.common.service.PrintLogService;
import com.foreverwin.mesnac.common.util.ExceptionUtil;
import com.foreverwin.mesnac.common.util.NumberUtil;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.dispatch.mapper.SurplusReturnMapper;
import com.foreverwin.mesnac.dispatch.model.SurplusInventory;
import com.foreverwin.mesnac.dispatch.model.SurplusReturn;
import com.foreverwin.mesnac.dispatch.service.SurplusInventoryService;
import com.foreverwin.mesnac.dispatch.service.SurplusReturnService;
import com.foreverwin.mesnac.meapi.model.Inventory;
import com.foreverwin.mesnac.meapi.model.InventoryAssyData;
import com.foreverwin.mesnac.meapi.service.InventoryAssyDataService;
import com.foreverwin.mesnac.meapi.service.InventoryService;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.meext.MEServices;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.dispatch.model.SurplusReturn;
import com.foreverwin.mesnac.dispatch.mapper.SurplusReturnMapper;
import com.foreverwin.mesnac.dispatch.service.SurplusReturnService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.modular.core.util.CommonMethods;
import com.sap.me.inventory.InventoryServiceInterface;
import com.sap.me.inventory.InventorySplitRequest;
import com.sap.me.inventory.NewSplitInventory;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
@ -226,4 +224,11 @@ public class SurplusReturnServiceImpl extends ServiceImpl<SurplusReturnMapper, S
printLog.setCreatedDateTime(dateTime);
printLogService.save(printLog);
}
@Override
public List<SurplusReturn> surplusReturnTable(String item, String itemDescription) {
String locale = LocaleContextHolder.getLocale().getLanguage();
String site = CommonMethods.getSite();
return surplusReturnMapper.surplusReturnTable(site,locale,item,itemDescription);
}
}

19
dispatch/src/main/resources/mapper/SurplusReturnMapper.xml
Unescape Escape View File

@ -17,6 +17,7 @@
<result column="CREATED_DATE_TIME" property="createdDateTime" />
<result column="MODIFY_USER" property="modifyUser" />
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
<result column="ITEM_DESCRIPTION" property="itemDescription"/>
</resultMap>
<!-- 通用查询结果列 -->
@ -456,4 +457,22 @@
LEFT JOIN CUSTOM_FIELDS CS2 ON CS2.HANDLE = IM.HANDLE AND CS2.ATTRIBUTE = 'PER_SQUARE_METER'
WHERE IV.HANDLE = #{inventoryBo}
</select>
<select id="surplusReturnTable" resultMap="BaseResultMap">
SELECT ZSR.INVENTORY INVENTORY,ZSR.ITEM_BO ITEM_BO,IT.DESCRIPTION ITEM_DESCRIPTION,ZSR.LENGHT LENGHT,
ZSR.WIDTH WIDTH,ZSR.NUMBERS NUMBERS,ZSR.QTY QTY,ZSR.CREATED_DATE_TIME CREATED_DATE_TIME
FROM
Z_SURPLUS_RETURN ZSR
INNER JOIN ITEM I ON I.HANDLE = ZSR.ITEM_BO
INNER JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE
<where>
ZSR.SITE = #{site}
<if test="item != null and item != ''">
AND I.ITEM LIKE '%${item}%'
</if>
<if test="itemDescription != null and itemDescription != ''">
AND IT.DESCRIPTION LIKE '%${itemDescription}%'
</if>
</where>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save