| | |
|---|
| | | import com.zy.core.properties.SlaveProperties; |
|---|
| | | import com.zy.core.properties.SystemProperties; |
|---|
| | | import com.zy.core.thread.BarcodeThread; |
|---|
| | | import com.zy.core.thread.MelsecCrnThread; |
|---|
| | | import com.zy.core.thread.ScaleThread; |
|---|
| | | import com.zy.core.thread.SiemensCrnThread; |
|---|
| | | import lombok.extern.slf4j.Slf4j; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | |
|---|
| | | return R.ok().add(list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @PostMapping("/latest/data/scale") |
|---|
| | | @ManagerAuth(memo = "磅秤实时数据") |
|---|
| | | public R scaleLatestData(){ |
|---|
| | |
|---|
| | | CrnDetailVo vo = new CrnDetailVo(); |
|---|
| | | for (CrnSlave crnSlave : slaveProperties.getCrn()) { |
|---|
| | | if (crnSlave.getId().equals(crnNo)) { |
|---|
| | | MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); |
|---|
| | | SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); |
|---|
| | | CrnProtocol crnProtocol = crnThread.getCrnProtocol(); |
|---|
| | | vo.setCrnNo(crnNo); |
|---|
| | | vo.setWorkNo(crnProtocol.getTaskNo()); |
|---|
