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

Merge branch 'master' of https://gitee.com/wanli_yang/mesnac_-mes

Browse Source
master
yinq 2 years ago
parent 1e7d9eda5f 5c20c2d51d
commit 2fc4a7993d
4 changed files with 94 additions and 13 deletions
Show Stats Download Patch File Download Diff File

26
meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LogisticsTurnoverController.java
Unescape Escape View File

@ -303,18 +303,18 @@ public class LogisticsTurnoverController {
}
// @PostMapping("/selectSFC")
// @ResponseBody
// public String selectSFC(String sfc){
// StoreSfcInfo storeSfcInfo= logisticsTurnoverService.storeSelectSfc(sfc);
// return Optional.ofNullable(storeSfcInfo).map(t->JSONObject.toJSONString(t)).orElse("null");
// }
// @PostMapping("/submentInStore")
// @ResponseBody
// public String selectSFC(String sfc,double qty,int inStoreType,String user,
// @RequestParam(value = "storeLocation",defaultValue = "") String storeLocation){
//
// return logisticsTurnoverService.submentInStore(sfc,qty, inStoreType, user,storeLocation);
// }
@PostMapping("/selectSFC")
@ResponseBody
public String selectSFC(String sfc){
StoreSfcInfo storeSfcInfo= logisticsTurnoverService.storeSelectSfc(sfc);
return Optional.ofNullable(storeSfcInfo).map(t->JSONObject.toJSONString(t)).orElse("null");
}
@PostMapping("/submentInStore")
@ResponseBody
public String selectSFC(String sfc,double qty,int inStoreType,String user,
@RequestParam(value = "storeLocation",defaultValue = "") String storeLocation){
return logisticsTurnoverService.submentInStore(sfc,qty, inStoreType, user,storeLocation);
}
}

5
meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsTurnoverService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.foreverwin.mesnac.meapi.dto.LogisticsDto;
import com.foreverwin.mesnac.meapi.model.Location;
import com.foreverwin.mesnac.meapi.model.LogisticsTurnover;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.mesnac.meapi.model.StoreSfcInfo;
import com.foreverwin.modular.core.util.FrontPage;
import java.util.List;
@ -40,4 +41,8 @@ public interface LogisticsTurnoverService extends IService<LogisticsTurnover> {
Boolean Receivelogistics(StringBuffer message, List<LogisticsDto> logisticsDtoList);
boolean updateLogistics(List<LogisticsDto> logisticsDtoList, Location lt,StringBuffer message, String transportno, String user, String username);
StoreSfcInfo storeSelectSfc(String sfc);
String submentInStore(String sfc, double qty, int inStoreType, String user,String storeLocation);
}

23
meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsTurnoverServiceImpl.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.foreverwin.mesnac.meapi.dto.LogisticsDto;
import com.foreverwin.mesnac.meapi.mapper.LogisticsBillMapper;
import com.foreverwin.mesnac.meapi.model.Location;
import com.foreverwin.mesnac.meapi.model.LogisticsBill;
import com.foreverwin.mesnac.meapi.model.StoreSfcInfo;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -127,5 +128,27 @@ public class LogisticsTurnoverServiceImpl extends ServiceImpl<LogisticsTurnoverM
}
return flag;
}
@Override
public StoreSfcInfo storeSelectSfc(String sfc) {
return logisticsTurnoverMapper.storeSelectSfc(sfc);
}
@Override
public String submentInStore(String sfc, double qty, int inStoreType, String user,String storeLocation) {
int i =logisticsTurnoverMapper.insertRecordInStore(sfc,qty, inStoreType, user,storeLocation);
if (i>0){
if (inStoreType==0){
int tag=logisticsTurnoverMapper.countLedgerBySfc(sfc);
if (tag==0){
logisticsTurnoverMapper.insertRecordLedger(sfc,qty,storeLocation);
}else {
logisticsTurnoverMapper.updateRecordLedger(sfc,qty);
}
}
return "suess";
}else {
return "error";
}
}
}

53
meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml
Unescape Escape View File

@ -757,4 +757,57 @@
</where>
</select>
<resultMap id="StoreSfcInfoM" type="com.foreverwin.mesnac.meapi.model.StoreSfcInfo">
<result column="SFC" property="sfc"/>
<result column="DISPATCH_QTY" property="dispatch_qty"/>
<result column="ITEM_BO" property="item_bo"/>
<result column="DESCRIPTION" property="description"/>
<result column="WORK_ORDER" property="work_order"/>
<result column="ITEM_NUMBER" property="item_number"/>
<result column="zs_qty" property="zs_qty"/>
<result column="ls_qty" property="ls_qty"/>
</resultMap>
<select id="storeSelectSfc" resultMap="StoreSfcInfoM">
SELECT *
FROM (SELECT zsd.sfc,
DISPATCH_QTY,
so.SHOP_ORDER,
substr(it.ITEM_BO,
instr(it.ITEM_BO, ',', 1, 1) + 1,
instr(it.ITEM_BO, ',', 1, 2) - instr(it.ITEM_BO, ',', 1, 1) - 1) as ITEM_BO,
it.DESCRIPTION,
ATTRIBUTE,
VALUE ,
IN_QTY,
IN_TYPE
FROM (select *
from (SELECT sfc, DISPATCH_QTY, SHOP_ORDER
FROM Z_SFC_DISPATCH
WHERE SFC = #{sfc}
ORDER BY ACTUAL_COMPLETE_DATE DESC)
where ROWNUM = 1) zsd
left join SHOP_ORDER so on so.SHOP_ORDER = zsd.SHOP_ORDER
left join ITEM_T it on it.ITEM_BO = so.ITEM_BO
LEFT JOIN CUSTOM_FIELDS cf
ON cf.HANDLE = SO.HANDLE AND cf.ATTRIBUTE in ('WORK_ORDER', 'ITEM_NUMBER')
left join STORE_RECORD_IN ri on ri.SFC = zsd.SFC
) a PIVOT (max(VALUE) FOR ATTRIBUTE IN ('WORK_ORDER' AS WORK_ORDER,'ITEM_NUMBER' AS ITEM_NUMBER))
PIVOT (sum(IN_QTY) FOR IN_TYPE IN ('0' AS zs_qty,'1' AS ls_qty) )
</select>
<insert id="insertRecordInStore">
INSERT INTO WIP.STORE_RECORD_IN (SFC, IN_QTY, STORE_LOCATION, WORK_USER, IN_TYPE)
VALUES (#{sfc}, #{qty}, #{storeLocation}, #{user}, #{inStoreType})
</insert>
<select id="countLedgerBySfc" resultType="integer">
select count(1) from STORE_RECORD_LEDGER where SFC=#{sfc}
</select>
<insert id="insertRecordLedger">
INSERT INTO WIP.STORE_RECORD_LEDGER (SFC, IN_QTY, STORE_LOCATION) VALUES (#{sfc}, #{qty}, #{storeLocation})
</insert>
<update id="updateRecordLedger">
update WIP.STORE_RECORD_LEDGER set IN_QTY=IN_QTY+#{qty} where SFC=#{sfc}
</update>
</mapper>

Write Preview
Loading…
Cancel
Save